diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index 51d1da7..5c5ceed 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -139,7 +139,7 @@ create_install() {
     info "Installing packages for $EDITION on $DEVICE..."
     # Install device and editions specific packages
     $NSPAWN $TMPDIR/root pacman -Syyu base manjaro-system manjaro-release $PKG_DEVICE $PKG_EDITION --noconfirm
-        if [[ "$DEVICE" = "on2" ]] || [[ "$DEVICE" = "rpi4" ]]; then
+    if [[ "$DEVICE" = "on2" ]] || [[ "$DEVICE" = "rpi4" ]]; then
     if [[ "$EDITION" = "kde-plasma" ]] || [[ "$EDITION" = "cubocore" ]]; then
     $NSPAWN $TMPDIR/root pacman -R sddm sddm-kcm matcha-dynamic-sddm --noconfirm
     $NSPAWN $TMPDIR/root pacman -S sddm-compat sddm-kcm matcha-dynamic-sddm --noconfirm
@@ -160,13 +160,6 @@ create_install() {
     info "Applying overlay for $EDITION..."
     cp -ap $TMPDIR/arm-profiles/overlays/$EDITION/* $TMPDIR/root/
 
-    info "Enabling user services..."
-    if [[ "$EDITION" = "minimal" ]] || [[ "$EDITION" = "server" ]]; then
-        echo "No user services for $EDITION edition"
-    else
-        $NSPAWN $TMPDIR/root --user $(cat $TMPDIR/user) systemctl --user enable pulseaudio.service 1> /dev/null 2>&1
-    fi
-
     info "Setting up users..."
     #setup users
     echo "$USER" > $TMPDIR/user
@@ -181,6 +174,13 @@ create_install() {
     $NSPAWN $TMPDIR/root usermod -aG $USERGROUPS $(cat $TMPDIR/user) 1> /dev/null 2>&1
     $NSPAWN $TMPDIR/root chfn -f "$FULLNAME" $(cat $TMPDIR/user) 1> /dev/null 2>&1
     
+    info "Enabling user services..."
+    if [[ "$EDITION" = "minimal" ]] || [[ "$EDITION" = "server" ]]; then
+        echo "No user services for $EDITION edition"
+    else
+        $NSPAWN $TMPDIR/root --user $(cat $TMPDIR/user) systemctl --user enable pulseaudio.service 1> /dev/null 2>&1
+    fi
+    
     info "Setting up system settings..."
     #system setup
     $NSPAWN $TMPDIR/root chmod u+s /usr/bin/ping 1> /dev/null 2>&1
@@ -195,6 +195,7 @@ create_install() {
     echo "KEYMAP=$KEYMAP" | tee --append $TMPDIR/root/etc/vconsole.conf 1> /dev/null 2>&1
     $NSPAWN $TMPDIR/root localectl set-x11-keymap $KEYMAP 1> /dev/null 2>&1
     echo "$HOSTNAME" | tee --append $TMPDIR/root/etc/hostname 1> /dev/null 2>&1
+    $NSPAWN $TMPDIR/root systemctl disable systemd-resolved.service 1> /dev/null 2>&1
 
     echo "Correcting permissions from overlay..."
     chown -R root:root $TMPDIR/root/etc
@@ -398,11 +399,10 @@ cleanup () {
         partprobe $SDCARD 1> /dev/null 2>&1
         
     elif [[ "$DEVICE" = "on2" ]] || [[ "$DEVICE" = "vim1" ]] || [[ "$DEVICE" = "vim2" ]] || [[ "$DEVICE" = "vim3" ]]; then
-    
     # move boot files
         mv $TMPDIR/root/boot/* $TMPDIR/boot
-    #flash bootloader
     if [[ "$DEVICE" = "on2" ]]; then
+    #flash bootloader
         dd if=$TMPDIR/boot/u-boot.bin of=${LDEV} conv=fsync,notrunc bs=512 seek=1 1> /dev/null 2>&1
     fi