diff --git a/include/functions b/include/functions
index 618439f..52492b1 100644
--- a/include/functions
+++ b/include/functions
@@ -13,3 +13,24 @@ usage() {
 sub_to_list() {
   echo "From: $1 Subject: subscribe" | sudo -u $1 mail $LIST_NAME 
 }
+
+makeuser_no_ansible()
+{
+	echo "adding new user $1"
+	newpw=`pwgen -1B 10`
+	pwcrypt=$(perl -e "print crypt('${newpw}', 'sa');")
+	sudo useradd -m -g 1000 -p $pwcrypt -s /bin/bash $1 || exit 1
+	#This is the welcome for team.
+	#sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" $EMAIL_TEMPLATE | sudo mail $1 $2 $ADMIN_EMAIL 
+
+	#This is the welcome email for thunix
+	sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
+	sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
+	sub_to_list $1
+
+	#We don't need this for thunix, since ansible will do it
+	#echo "$3" | tee /home/$1/.ssh/authorized_keys
+
+	#If root doesn't have a fediverse account, comment this out
+	#sudo toot "welcome new user ~$1!"
+}
diff --git a/makeuser b/makeuser
index 72b6e9e..5f441f2 100755
--- a/makeuser
+++ b/makeuser
@@ -23,23 +23,8 @@ case $1 in
     usage; error_exit "unknown option $1" ;;
   *)
     [[ $# -ne 3 ]] && error_exit "not enough args"
-    echo "adding new user $1"
-    newpw=`pwgen -1B 10`
-    pwcrypt=$(perl -e "print crypt('${newpw}', 'sa');")
-    sudo useradd -m -g 1000 -p $pwcrypt -s /bin/bash $1 || exit 1
-#		This is the welcome for team.
-#    sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" $EMAIL_TEMPLATE | sudo mail $1 $2 $ADMIN_EMAIL 
-
-#		This is the welcome email for thunix
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
-    sub_to_list $1
-
-#		We don't need this for thunix, since ansible will do it
-#		echo "$3" | tee /home/$1/.ssh/authorized_keys
-
-# If root doesn't have a fediverse account, comment this out
-#    sudo toot "welcome new user ~$1!"
+     
+    makeuser_no_ansible #adding new user
 
 #Thunix specific section
 		currdir=`pwd`
diff --git a/makeuser_no_ansible b/makeuser_no_ansible
index 9b8543e..757a543 100755
--- a/makeuser_no_ansible
+++ b/makeuser_no_ansible
@@ -22,23 +22,8 @@ case $1 in
     usage; error_exit "unknown option $1" ;;
   *)
     [[ $# -ne 3 ]] && error_exit "not enough args"
-    echo "adding new user $1"
-    newpw=`pwgen -1B 10`
-    pwcrypt=$(perl -e "print crypt('${newpw}', 'sa');")
-#    sudo useradd -m -g 1000 -p $pwcrypt -s /bin/bash $1 || exit 1
-#		This is the welcome for team.
-#    sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" $EMAIL_TEMPLATE | sudo mail $1 $2 $ADMIN_EMAIL 
 
-#		This is the welcome email for thunix
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
-    sub_to_list $1
-
-#		We don't need this for thunix, since ansible will do it
-#		echo "$3" | tee /home/$1/.ssh/authorized_keys
-
-# If root doesn't have a fediverse account, comment this out
-#    sudo toot "welcome new user ~$1!"
+    makeuser_no_ansible #adding new user
 
 		;;