diff --git a/pkg/controller/account/login.go b/pkg/controller/account/login.go
index 4f3a87d..401c96f 100644
--- a/pkg/controller/account/login.go
+++ b/pkg/controller/account/login.go
@@ -88,7 +88,7 @@ func Login() http.HandlerFunc {
 				// Are they submitting the 2FA code?
 				var (
 					intent = r.PostFormValue("intent")
-					code   = r.PostFormValue("code")
+					code   = strings.ReplaceAll(r.PostFormValue("code"), " ", "")
 				)
 
 				// Validate the submitted code.
diff --git a/web/templates/account/settings.html b/web/templates/account/settings.html
index b5a4df6..458ea7a 100644
--- a/web/templates/account/settings.html
+++ b/web/templates/account/settings.html
@@ -802,6 +802,10 @@ window.addEventListener("DOMContentLoaded", (event) => {
                 console.log("button %s: ADD is-active", tab_);
                 tab_.classList.add("is-active");
             }
+
+            tab_.addEventListener("click", (e) => {
+                document.querySelector("#"+name_).scrollIntoView();
+            });
         });
 
         $activeTab.style.display = 'block';