1 files changed, 2 insertions, 2 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index b27f24f2..c7dfd21f 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -219,7 +219,7 @@
 	// Add keychain or plaintext password as appropriate - note the checks in initiateConnection.
 	if (connectionSSHKeychainItemName) {
 		[sshTunnel setPasswordKeychainName:connectionSSHKeychainItemName account:connectionSSHKeychainItemAccount];
-	} else {
+	} else if (sshPassword) {
 		[sshTunnel setPassword:[self sshPassword]];
 	}
 
@@ -281,7 +281,7 @@
 	}
 
 	// Only set the password if there is no Keychain item set. The connection will ask the delegate for passwords in the Keychain.	
-	if (!connectionKeychainItemName) {
+	if (!connectionKeychainItemName && [self password]) {
 		[mySQLConnection setPassword:[self password]];
 	}