diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
index d70f9318e5db8eb688d0aa610a9bcfbef06146d5..8afea6d77df36a07f0a13204e1a95935d10dd57d 100644
--- a/apps/files_encryption/js/settings-personal.js
+++ b/apps/files_encryption/js/settings-personal.js
@@ -14,18 +14,20 @@ $(document).ready(function(){
 		if (client) {
 			$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'client' });
 			if (prevmode == 'server') {
-				OC.dialogs.info(t('encryption', 'Please go to your owncloud client and change your encryption password to complete the conversion'), t('encryption', 'switched to client side encryption'));
+				OC.dialogs.info(t('encryption', 'Please switch to your ownCloud client and change your encryption password to complete the conversion.'), t('encryption', 'switched to client side encryption'));
 			}
 		} else if (server) {
 			if (prevmode == 'client') {
-		    OC.dialogs.form([{text:'login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) {
-		   		$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) {
-		   			if (result.status != 'success') {
-		   				document.getElementById(prevmode+'_encryption').checked = true;
-		   				OC.dialogs.alert(t('encryption', 'Please check your passwords and try again'), t('encryption', 'Could not change your file encryption password to your login password'))
-		   			}
-		   		});
-		    });
+				OC.dialogs.form([{text:'login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) {
+					$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) {
+						if (result.status != 'success') {
+							document.getElementById(prevmode+'_encryption').checked = true;
+							OC.dialogs.alert(t('encryption', 'Please check your passwords and try again.'), t('encryption', 'Could not change your file encryption password to your login password'))
+						} else {
+							console.log("alles super");
+						}
+					}, true);
+				});
 			} else {
 				$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server' });
 			}
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 8d56ac97dc5917f21949159bb41369f4f3eae18f..43ac67f8cbafe4d57d6fa2059018e19d96a21687 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -228,7 +228,6 @@ class Keymanager {
 				if ( ($key = Crypt::symmetricEncryptFileContent($key, $newpasswd)) ) {
 					Keymanager::setPrivateKey($key);
 					return true;
-				
 				}
 			}
 		}