diff --git a/basics.sh b/basics.sh
index 0d17728..71e064d 100755
--- a/basics.sh
+++ b/basics.sh
@@ -51,6 +51,7 @@ configure_user() {
 
 	mkdir -p "$tilde_homedir"
 	mkdir -p "$user_homedir"
+	touch "$user_homedir/first_login"
 
 	cp "/root/.gtkrc-2.0" "$user_homedir"
 	cp -r "/root/.config" "$user_homedir"
diff --git a/dotprofile.template b/dotprofile.template
index e199c9e..4932ead 100644
--- a/dotprofile.template
+++ b/dotprofile.template
@@ -15,8 +15,13 @@ then
 
 	cd {{ TILDE_HOMEDIR }}
 
-#	TODO: Give user more control over xdg user dir creation
-	mkdir Desktop Download Music Pictures Public Templates Videos >/dev/null
+	if [ -f {{ USER_HOMEDIR }}/first_login ]
+	then
+		rm {{ USER_HOMEDIR }}/first_login
+
+#		TODO: Give user more control over xdg user dir creation
+		mkdir Desktop Download Music Pictures Public Templates Videos
+	fi
 
 	startx
 else