diff --git a/dev/View/Popup/OpenPgpImport.js b/dev/View/Popup/OpenPgpImport.js
index 55f886782..79a43ac54 100644
--- a/dev/View/Popup/OpenPgpImport.js
+++ b/dev/View/Popup/OpenPgpImport.js
@@ -1,6 +1,5 @@
 import { PgpUserStore } from 'Stores/User/Pgp';
 
-import { decorateKoCommands } from 'Knoin/Knoin';
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
 import { Capa } from 'Common/Enums';
@@ -25,13 +24,9 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
 			this.keyError(false);
 			this.keyErrorMessage('');
 		});
-
-		decorateKoCommands(this, {
-			addOpenPgpKeyCommand: 1
-		});
 	}
 
-	addOpenPgpKeyCommand() {
+	submitForm() {
 		let keyTrimmed = this.key().trim();
 
 		if (/\n/.test(keyTrimmed)) {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
index c9ab6760d..496a4df2b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
@@ -40,10 +40,11 @@
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Store on server',
+				label: 'Store (encrypted) on server',
 				value: saveServer
 			}
 		}"></div>
+		<br/>
 		<div data-bind="visible: canGnuPG, component: {
 			name: 'Checkbox',
 			params: {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
index 14586466f..6377ad40a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
@@ -2,30 +2,29 @@
 	<a href="#" class="close" data-bind="command: cancelCommand">×</a>
 	<h3 data-i18n="OPENPGP/POPUP_IMPORT_TITLE"></h3>
 </header>
-<div class="modal-body">
+<form id="openpgp-import" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
 	<div class="alert"  data-bind="visible: keyError() && keyErrorMessage(), text: keyErrorMessage"></div>
-	<div class="form-horizontal">
-		<div class="control-group" data-bind="css: {'error': keyError}">
-			<textarea class="inputKey input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: key"></textarea>
-		</div>
-		<div class="control-group">
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'Store on server',
-					value: saveServer
-				}
-			}"></div>
-			<div data-bind="visible: canGnuPG, component: {
-				name: 'Checkbox',
-				params: {
-					label: 'Store on server in GnuPG',
-					value: saveGnuPG
-				}
-			}"></div>
-		</div>
+	<div class="control-group" data-bind="css: {'error': keyError}">
+		<textarea class="inputKey input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: key" required=""></textarea>
 	</div>
-</div>
+	<div class="control-group">
+		<div data-bind="component: {
+			name: 'Checkbox',
+			params: {
+				label: 'Store (encrypted) on server',
+				value: saveServer
+			}
+		}"></div>
+		<br/>
+		<div data-bind="visible: canGnuPG, component: {
+			name: 'Checkbox',
+			params: {
+				label: 'Store on server in GnuPG',
+				value: saveGnuPG
+			}
+		}"></div>
+	</div>
+</form>
 <footer>
-	<a class="btn" data-bind="command: addOpenPgpKeyCommand" data-icon="✚" data-i18n="OPENPGP/POPUP_IMPORT_BUTTON"></a>
+	<button class="btn" form="openpgp-import" data-icon="✚" data-i18n="OPENPGP/POPUP_IMPORT_BUTTON"></button>
 </footer>