diff --git a/src/accountant.rs b/src/accountant.rs
index 50b76e529a..afd4bea103 100644
--- a/src/accountant.rs
+++ b/src/accountant.rs
@@ -118,6 +118,7 @@ impl Accountant {
 
         if !tr.if_all.is_empty() {
             self.pending.insert(tr.sig, tr.clone());
+            return Ok(());
         }
 
         if self.balances.contains_key(&tr.to) {
diff --git a/src/transaction.rs b/src/transaction.rs
index 3f2a1e99d4..046d8485a0 100644
--- a/src/transaction.rs
+++ b/src/transaction.rs
@@ -60,7 +60,14 @@ impl<T: Serialize> Transaction<T> {
     }
 
     fn get_sign_data(&self) -> Vec<u8> {
-        serialize(&(&self.from, &self.to, &self.asset, &self.last_id)).unwrap()
+        serialize(&(
+            &self.from,
+            &self.to,
+            &self.if_all,
+            &self.unless_any,
+            &self.asset,
+            &self.last_id,
+        )).unwrap()
     }
 
     pub fn sign(&mut self, keypair: &KeyPair) {