diff --git a/config/bash/aliases b/config/bash/aliases
index 9f698d7..598e825 100644
--- a/config/bash/aliases
+++ b/config/bash/aliases
@@ -29,6 +29,12 @@ options+=("mkdir" "mkdir -pv" off)
 if [ -f /usr/bin/trizen ]; then
 	options+=("trizen" "sudo -u aurbuilder trizen" on)
 fi
+if [ -f /usr/bin/yay ]; then
+	options+=("yay" "sudo -u aurbuilder yay" on)
+fi
+if [ -f /usr/bin/aurman ]; then
+	options+=("aurman" "sudo -u aurbuilder aurman" on)
+fi
 if [ -f /usr/bin/yaourt ]; then
 	options+=("yaourt" "sudo -u aurbuilder yaourt --color" on)
 	options+=("yaourt(2)" "sudo -u aurbuilder yaourt" off)
@@ -84,6 +90,8 @@ for itm in $sel; do
 		;;
 		'"mkdir"') echo "alias mkdir='mkdir -pv'" >> /etc/profile.d/alias.sh;;
 		'"trizen"') echo "alias trizen='sudo -u aurbuilder trizen'" >> /etc/profile.d/alias.sh;;
+		'"yay"') echo "alias yay='sudo -u aurbuilder yay'" >> /etc/profile.d/alias.sh;;
+		'"aurman"') echo "alias aurman='sudo -u aurbuilder aurman'" >> /etc/profile.d/alias.sh;;
 		'"yaourt"') echo "alias yaourt='sudo -u aurbuilder yaourt --color'" >> /etc/profile.d/alias.sh;;
 		'"yaourt(2)"') echo "alias yaourt='sudo -u aurbuilder yaourt'" >> /etc/profile.d/alias.sh;;
 		'"yaourt(3)"') echo "alias yaourt='yaourt --color'" >> /etc/profile.d/alias.sh;;
diff --git a/updates/menu b/updates/menu
index 5ca715a..cee89ab 100644
--- a/updates/menu
+++ b/updates/menu
@@ -83,7 +83,9 @@ checkaurdependencies(){
     echo -e "$newpass\n$newpass\n"|passwd aurbuilder
     newpass=""
   else
-    usermod -m -d /tmp/aurbuilder aurbuilder 1&>/dev/null
+    mkdir /tmp/aurbuilder 1&>/dev/null
+    chmod	777 /tmp/aurbuilder
+    usermod -d /tmp/aurbuilder aurbuilder 1&>/dev/null
   fi
   if [ ! -f /etc/sudoers.d/aurbuilder ]; then
     echo "aurbuilder ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/aurbuilder
@@ -92,8 +94,6 @@ checkaurdependencies(){
 }
 checkpackagequerydependencies(){
   if [ ! -f /usr/bin/package-query ]; then
-    mkdir /tmp/aurbuilder 1&>/dev/null
-    chmod	777 /tmp/aurbuilder
     cd /tmp/aurbuilder
     sudo -u aurbuilder git clone https://aur.archlinux.org/package-query.git
     cd package-query
@@ -142,8 +142,6 @@ case $sel in
     if(confirm "Trizen allow you to access the AUR applications.\nBecause is not possible to compile applications as root,\nthis installer create an aurbuilder user.\n\nInstall trizen ?") then
       clear
       checkaurdependencies
-      mkdir /tmp/aurbuilder 1&>/dev/null
-      chmod	777 /tmp/aurbuilder
       cd /tmp/aurbuilder
       sudo -u aurbuilder git clone https://aur.archlinux.org/trizen.git
       cd trizen
@@ -154,8 +152,6 @@ case $sel in
     if(confirm "Aurman allow you to access the AUR applications.\nBecause is not possible to compile applications as root,\nthis installer create an aurbuilder user.\n\nInstall aurman ?") then
       clear
       checkaurdependencies
-      mkdir /tmp/aurbuilder 1&>/dev/null
-      chmod	777 /tmp/aurbuilder
       cd /tmp/aurbuilder
       sudo -u aurbuilder git clone https://aur.archlinux.org/aurman.git
       cd aurman
@@ -168,8 +164,6 @@ case $sel in
     if(confirm "Yay allow you to access the AUR applications.\nBecause is not possible to compile applications as root,\nthis installer create an aurbuilder user.\n\nInstall yay ?") then
       clear
       checkaurdependencies
-      mkdir /tmp/aurbuilder 1&>/dev/null
-      chmod	777 /tmp/aurbuilder
       cd /tmp/aurbuilder
       sudo -u aurbuilder git clone https://aur.archlinux.org/yay.git
       cd yay
@@ -181,8 +175,6 @@ case $sel in
       clear
       checkaurdependencies
       checkpackagequerydependencies
-      mkdir /tmp/aurbuilder 1&>/dev/null
-      chmod	777 /tmp/aurbuilder
       cd /tmp/aurbuilder
       sudo -u aurbuilder git clone https://aur.archlinux.org/yaourt.git
       cd yaourt