diff --git a/setup.sh b/setup.sh
index 02f3db4..889cb02 100755
--- a/setup.sh
+++ b/setup.sh
@@ -17,6 +17,12 @@ setup_tildelinux() {
 	echo "What is your username for $tilde_name?"
 	read tilde_username
 	
+	if grep -q "$tilde_username@$tilde_name" /tilde/current_tilde
+	then
+		echo "You are already using $tilde_name as $tilde_username! Exiting..."
+		exit
+	fi
+
 	if ! grep -q "$tilde_username@$tilde_name" /tilde/tildes
 	then
 		echo "Now you will need to provide tildelinux with your ssh private key"
diff --git a/user.sh b/user.sh
index 8236d97..4a53d06 100755
--- a/user.sh
+++ b/user.sh
@@ -70,5 +70,7 @@ configure_user() {
 	sed -i "s|{{ TILDE_USERNAME }}|$tilde_username|g" "/tilde/tildes"
 	sed -i "s|{{ KEY_FILE }}|$key_file|g" "/tilde/tildes"
 
+	echo "$tilde_username@$tilde_name" > /tilde/current_tilde
+
 	systemctl daemon-reload
 }