diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index 2e3a4c9f8..862fe4a0f 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -77,6 +77,16 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 		});
 	}
 
+	generateTOTP() {
+		let CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567',
+			length = 16,
+			secret = '';
+		while (0 < length--) {
+			secret += CHARS[Math.floor(Math.random() * 32)];
+		}
+		this.adminTOTP(secret);
+	}
+
 	saveAdminUserCommand() {
 		if (!this.adminLogin().trim()) {
 			this.adminLoginError(true);
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index 1b7fa65e3..54b1bbc69 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -65,6 +65,7 @@
 		<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
 			pattern="[A-Z2-7]{16,}"
 			data-bind="textInput: adminTOTP">
+		<button type="button" data-bind="click:generateTOTP">Generate</button>
 	</div>
 	<div class="control-group">
 		<label></label>