diff --git a/Makefile b/Makefile
index c2d5e15..1c06504 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ test:
 install_bin:
 	@echo
 	@echo "$(ccyellow)> Installing orbit bin$(ccend)"
-	rm $(EXEC_PATH)
+	rm -f $(EXEC_PATH)
 	ln -s $(_path)/bin/orbit $(EXEC_PATH)
 
 install_conf:
@@ -53,7 +53,7 @@ install_user:
 ifeq ($(shell id -u $(_user) 2>/dev/null),)
 	@echo
 	@echo "$(ccyellow)> Creating user $(_user)$(ccend)"
-	useradd -m -d /var/$(_user) -s /usr/sbin/nologin -c "Orbit gemini service account" -U $(_user)
+	useradd -m -d /var/gemini -s /usr/sbin/nologin -c "Orbit gemini service account" -U $(_user)
 endif
 
 install_service:
@@ -62,7 +62,7 @@ install_service:
 	install orbit.service $(SERVICE_PATH)
 	sed -i -e 's/{USER}/$(_user)/' $(SERVICE_PATH)
 
-install: install_bin install_conf install_cert install_user install_service
+install: install_bin install_user install_conf install_cert install_service
 	@echo
 	@echo "--------------------------------"
 	@echo "done"