diff --git a/cmd/login.go b/cmd/login.go
index 78e1130..57105b1 100644
--- a/cmd/login.go
+++ b/cmd/login.go
@@ -30,14 +30,6 @@ var loginCmd = &cobra.Command{
 		cobra.CheckErr(err)
 		defer db.Close()
 
-		//get default server
-		// if server == "" {
-		// 	ds, err := db.GetActiveServer()
-		// 	cobra.CheckErr(err)
-
-		// 	server = ds
-		// }
-
 		cli, err := client.New(server)
 		cobra.CheckErr(err)
 		defer cli.Close()
@@ -48,7 +40,7 @@ var loginCmd = &cobra.Command{
 
 		var runningCmd string
 		for runningCmd != "mctl" {
-			fmt.Printf("RCON@%s /> ", server)
+			fmt.Printf("RCON /> ")
 
 			if scanner.Scan() {
 				runningCmd = scanner.Text()
@@ -68,7 +60,7 @@ var loginCmd = &cobra.Command{
 			}
 		}
 
-		fmt.Printf("Disconnected from %s\n", server)
+		fmt.Println("Disconnected")
 	},
 }
 
diff --git a/database/sqlx.go b/database/sqlx.go
index 3d481ef..c5f0700 100644
--- a/database/sqlx.go
+++ b/database/sqlx.go
@@ -127,7 +127,7 @@ func (d *database) GetCmd(name string) (string, error) {
 		return "", err
 	}
 
-	return name, nil
+	return cmd, nil
 }
 
 // gets all saved commands