diff --git a/fresh.sh b/fresh.sh
index bd22266..d27c00d 100755
--- a/fresh.sh
+++ b/fresh.sh
@@ -133,10 +133,16 @@ installation_loop() {
 
 enable_service() {
     for service in "$@"; do
-    dialog --infobox "Enabling: $service" 0 0
-    systemctl enable "$service"
-    systemctl start "$service"
-    echo "Services $service started\n\n" >> $logfile
+        dialog --infobox "Enabling: $service" 0 0
+        if [[ $@ =~ "--user.*" ]]
+        then
+            sudo -u $uname systemctl enable "$service"
+            sudo -u $uname systemctl start "$service"
+        else
+            systemctl enable "$service"
+            systemctl start "$service"
+        fi
+        echo "Services $service started\n\n" >> $logfile
     done
 }
 
@@ -206,8 +212,8 @@ set_pacman_config() {
 }
 
 set_git_config() {
-    sudo -u $uname git config --global user.email=philip.gaber@gmail.com
-    sudo -u $uname git config --global user.name=Toerd@$(hostname)
+    sudo -u $uname git config --global user.email "philipg@posteo.de"
+    sudo -u $uname git config --global user.name "Toerd@"$(hostname)
     sudo -u $uname git config --global credential.useHttpPath true
     sudo -u $uname git config --global credential.helper /usr/bin/pass-git-helper
 }
@@ -236,11 +242,10 @@ case $todo in
         get_credentials
         pre_install
         create_user
-        set_permissions "%wheel ALL=(ALL) NOPASSWD: ALL"
         install_aur_helper
         installation_loop
         download_dotfiles
-        set_permissions "%wheel ALL=(ALL) ALL\\n%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Syyu,/usr/bin/pacman -Syyu --noconfirm,/usr/bin/loadkeys"
+        set_permissions "Defaults timestamp_timeout=45\n%wheel ALL=(ALL) ALL\n%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Syyu,/usr/bin/pacman -Syyu --noconfirm,/usr/bin/loadkeys"
         no_beep
         set_system_stuff
         enable_service "--user syncthing" "netctl-auto@wlp3s0" "--user offlineimap@philip_thi" "--user offlineimap@philip_posteo" "--user offlineimap@philip_gmail"
diff --git a/pack.csv b/pack.csv
index 1077830..7a70be5 100644
--- a/pack.csv
+++ b/pack.csv
@@ -72,7 +72,7 @@ A,P,pandoc,A universal document converter
 A,P,auctex,latexpreview
 
 # Mail
-A,P,mu,Maildir indexer/searcher and Emacs client (mu4e)
+A,A,mu,Maildir indexer/searcher and Emacs client (mu4e)
 A,P,offlineimap,Synchronizes emails between two repositories
 
 # Webbrowsing