Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Http/Requests/User/UpdateUserRequest.php

@@ -56,6 +56,8 @@ class UpdateUserRequest extends Request
             $input['email'] = trim($input['email']);
         } elseif (isset($input['email'])) {
             $input['email'] = false;
+        } else {
+            $input['email'] = $this->user->email;
         }
 
         if (array_key_exists('first_name', $input)) {

app/Services/EDocument/Gateway/Transformers/StorecoveExpense.php

@@ -204,6 +204,10 @@ class StorecoveExpense
                     $id_number = $pi->getId();
                 } elseif ($ident == 'routing_id') {
                     $routing_id = $pi->getId();
+                } else{
+                    //Sometimes some very unusual identifiers are returned, we should always skip these.
+                    // ie. IBAN, etc.
+                    continue;
                 }
             }
         }