diff --git a/discordo.go b/discordo.go
index 5f926ec..30eda99 100644
--- a/discordo.go
+++ b/discordo.go
@@ -35,16 +35,8 @@ func main() {
 	mainFlex = ui.NewMainFlex(guildsDropDown, channelsList, messagesTextView)
 	app = ui.NewApplication(onApplicationInputCapture)
 
-	email := util.GetPassword("email")
-	password := util.GetPassword("password")
 	token := util.GetPassword("token")
-	if email != "" && password != "" {
-		app.
-			SetRoot(mainFlex, true).
-			SetFocus(guildsDropDown)
-
-		discordSession = newSession(email, password, "")
-	} else if token != "" {
+	if token != "" {
 		app.
 			SetRoot(mainFlex, true).
 			SetFocus(guildsDropDown)
@@ -215,9 +207,7 @@ func onLoginFormLoginButtonSelected() {
 		}
 
 		discordSession = newSession(email, password, "")
-
-		util.SetPassword("email", email)
-		util.SetPassword("password", password)
+		util.SetPassword("token", discordSession.Token)
 	} else if loginVia == "token" {
 		token := loginForm.GetFormItemByLabel("Token").(*tview.InputField).GetText()
 		if token == "" {
@@ -225,7 +215,6 @@ func onLoginFormLoginButtonSelected() {
 		}
 
 		discordSession = newSession("", "", token)
-
 		util.SetPassword("token", token)
 	}
 
diff --git a/ui/forms.go b/ui/forms.go
index 857b649..af3afe2 100644
--- a/ui/forms.go
+++ b/ui/forms.go
@@ -16,7 +16,7 @@ func NewLoginForm(via string, onLoginFormLoginButtonSelected func(), onLoginForm
 		SetButtonBackgroundColor(loginFormButtonBackgroundColor).
 		SetBackgroundColor(loginFormBackgroundColor).
 		SetBorder(true).
-		SetBorderPadding(15, 15, 15, 15)
+		SetBorderPadding(0, 0, 1, 1)
 
 	if via == "token" {
 		loginForm.AddPasswordField("Token", "", 0, 0, nil)