1 files changed, 4 insertions, 1 deletions
diff --git a/limox.go b/limox.go
index 0e8c056..620f009 100644
--- a/limox.go
+++ b/limox.go
@@ -46,6 +46,7 @@ func NewLimox() Limox {
 	}
 
 	l.JidEditor.SetText(getLastJid())
+	l.PwdEditor.SetText(getLastPwd())
 
 	return l
 }
@@ -82,8 +83,10 @@ func (l *Limox) buttonCallback() {
 	case Disconnected:
 		log.Println("Starting connection establishment ...")
 		jid := l.JidEditor.Text()
+		pwd := l.PwdEditor.Text()
 		setLastJid(jid)
-		go xmpp.Run(l.XmppConn, jid, l.PwdEditor.Text())
+		setLastPwd(pwd)
+		go xmpp.Run(l.XmppConn, jid, pwd)
 		l.State = Connecting
 	case Connecting:
 		log.Println("Aborted connection establishment")