diff --git a/application/models/External_account_model.php b/application/models/External_account_model.php
index 912955f86..f64f9a8b9 100644
--- a/application/models/External_account_model.php
+++ b/application/models/External_account_model.php
@@ -83,10 +83,18 @@ public function initialize($where = false)
                     unset($columns[column('account', 'verifier')]);
                     unset($columns[column('account', 'salt')]);
                 }
-            } elseif ($encryption == 'SRP6' || $encryption == 'SRP') {
+            } elseif ($encryption == 'SRP') {
                 if (column('account', 'sha_pass_hash')){
                     unset($columns[column('account', 'sha_pass_hash')]);
                 }
+            } elseif ($encryption == 'SRP6') {
+                if (column('account', 'sha_pass_hash')){
+                    unset($columns[column('account', 'sha_pass_hash')]);
+                }
+                if (column('account', 'v') && column('account', 's')){
+                    unset($columns[column('account', 'v')]);
+                    unset($columns[column('account', 's')]);
+                }
             }
 
             if ($this->config->item('totp_secret')) {