diff --git a/setup.sh b/setup.sh
index 5d11aa5..ea74193 100755
--- a/setup.sh
+++ b/setup.sh
@@ -22,23 +22,32 @@ read tilde_name
 echo "What is your username for $tilde_name?"
 read tilde_username
 
-echo "Now you will need to provide tildelinux with your ssh private key"
-echo "By whatever means, place your private key in the /tilde/key directory"
-echo "Here is a shell, once the key is in the proper location, simply type \"exit\" to close the shell and continue"
-bash
+if ! grep -q "$tilde_username@$tilde_name" /tilde/tildes
+then
+	echo "Now you will need to provide tildelinux with your ssh private key"
+	echo "By whatever means, place your private key in the /tilde/key directory"
+	echo "Here is a shell, once the key is in the proper location, simply type \"exit\" to close the shell and continue"
+	bash
 
-echo "Looking for key file..."
-key_file="$(find_key_file '/tilde/key')"
-while [ -z "$key_file" ]
-do
-	echo "Could not find a valid key file in /tilde/key"
-	echo "Use this shell to try and fix any problems, then check again by exiting this shell"
-	echo "Use \`exit 1\` to abort the install"
-	bash || fail
+	echo "Looking for key file..."
 	key_file="$(find_key_file '/tilde/key')"
-done
-echo "Key file located at $key_file, testing connection..."
-connection_test "$key_file" "$tilde_username" "$tilde_name"
+	while [ -z "$key_file" ]
+	do
+		echo "Could not find a valid key file in /tilde/key"
+		echo "Use this shell to try and fix any problems, then check again by exiting this shell"
+		echo "Use \`exit 1\` to abort the install"
+		bash || fail
+		key_file="$(find_key_file '/tilde/key')"
+	done
+	echo "Key file located at $key_file, testing connection..."
+	connection_test "$key_file" "$tilde_username" "$tilde_name"
+else
+	key_file="$(cat /tilde/tildes \
+		| grep -A4 "Host $tilde_username@$tilde_name" \
+		| grep "IdentityFile" \
+		| cut -f2 -d ' ')"
+	echo "$tilde_name found in /tilde/tildes, using $key_file as key file"
+fi
 
 echo "Configuring user..."
 configure_user "$key_file" "$tilde_username" "$tilde_name" "$startx_command"