diff --git a/client/mcr.go b/client/mcr.go
index afc93df..dc4e8af 100644
--- a/client/mcr.go
+++ b/client/mcr.go
@@ -46,6 +46,9 @@ func New(name string) (*Client, error) {
 
 	var p []byte
 	_, err = base64.StdEncoding.Decode(p, []byte(srv.Password))
+	if err != nil {
+		return nil, err
+	}
 
 	//connect to game server
 	cli := mcr.NewClient(srv.Server, mcr.WithPort(srv.Port))
diff --git a/cmd/login.go b/cmd/login.go
index a9da7ab..78e1130 100644
--- a/cmd/login.go
+++ b/cmd/login.go
@@ -31,12 +31,12 @@ var loginCmd = &cobra.Command{
 		defer db.Close()
 
 		//get default server
-		if server == "" {
-			ds, err := db.GetActiveServer()
-			cobra.CheckErr(err)
+		// if server == "" {
+		// 	ds, err := db.GetActiveServer()
+		// 	cobra.CheckErr(err)
 
-			server = ds.Name
-		}
+		// 	server = ds
+		// }
 
 		cli, err := client.New(server)
 		cobra.CheckErr(err)