diff --git a/main.go b/main.go
index 3e99d67..035268b 100644
--- a/main.go
+++ b/main.go
@@ -88,7 +88,7 @@ func main() {
 					// The account has MFA enabled, reattempt login with MFA code and ticket.
 					mfaLoginForm := ui.NewLoginForm(true)
 					mfaLoginForm.AddButton("Login", func() {
-						code := loginForm.GetFormItem(0).(*tview.InputField).GetText()
+						code := mfaLoginForm.GetFormItem(0).(*tview.InputField).GetText()
 						if code == "" {
 							return
 						}
@@ -109,6 +109,8 @@ func main() {
 
 						go keyring.Set(name, "token", lr.Token)
 					})
+
+					app.SetRoot(mfaLoginForm, true)
 				}
 			})
 
@@ -132,16 +134,11 @@ func main() {
 		tview.Styles.BorderColor = tcell.GetColor(app.Config.Theme.Border)
 		tview.Styles.TitleColor = tcell.GetColor(app.Config.Theme.Title)
 
-		err = app.Run()
-		if err != nil {
-			panic(err)
-		}
-
-		return nil
+		return app.Run()
 	}
 
 	err := cliApp.Run(os.Args)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 }
diff --git a/ui/login.go b/ui/login.go
index add99ae..b72f707 100644
--- a/ui/login.go
+++ b/ui/login.go
@@ -12,7 +12,7 @@ func NewLoginForm(mfa bool) *LoginForm {
 	}
 
 	if mfa {
-		lf.AddPasswordField("MFA Code (optional)", "", 0, 0, nil)
+		lf.AddPasswordField("Authentication/Backup Code", "", 0, 0, nil)
 	} else {
 		lf.
 			AddInputField("Email", "", 0, nil, nil).