diff --git a/04-freeipa_realm_join.un b/04-freeipa_realm_join.un
index 1bb1336..1468462 100644
--- a/04-freeipa_realm_join.un
+++ b/04-freeipa_realm_join.un
@@ -18,20 +18,22 @@ else
 fi
 
 ## FreeIPA Realm Join
-if (whiptail --title "FreeIPA Relam Join" --yes-button "yes" --no-button "no" --yesno "Do You want to join a FreeIPA Realm?" 10 80)
-then
+if [ "$realm_join" == 1 ]; then
+  if (whiptail --title "FreeIPA Relam Join" --yes-button "yes" --no-button "no" --yesno "Do You want to join a FreeIPA Realm?" 10 80)
+  then
 
-  if [[ $HOSTNAME == *template* ]]; then
-    echo "Hostname $HOSTNAME contains the word 'template', skipping realm joining"
-    realm_join=0
-  fi
+    if [[ $HOSTNAME == *template* ]]; then
+      echo "Hostname $HOSTNAME contains the word 'template', skipping realm joining"
+      realm_join=0
+    fi
 
-  if [ "$realm_join" == 1 ]; then
-    echo "Setting up ipa-client to join FreeIPA Server Realm"
-    freeipa_admin=$(whiptail --passwordbox "Please enter the user authorized to join FreeIPA realm: $freeipa_admin" 8 78 --title "FreeIPA Admin User Prompt" 3>&1 1>&2 2>&3)
-    freeipa_password=$(whiptail --passwordbox "Please enter the password for the FreeIPA admin user: $freeipa_admin" 8 78 --title "FreeIPA Password Prompt" 3>&1 1>&2 2>&3)
-    ipa-client-install --mkhomedir --no-ntp --principal="$freeipa_admin" --password="$freeipa_password" --enable-dns-updates --unattended
+    if [ "$realm_join" == 1 ]; then
+      echo "Setting up ipa-client to join FreeIPA Server Realm"
+      freeipa_admin=$(whiptail --passwordbox "Please enter the user authorized to join FreeIPA realm: $freeipa_admin" 8 78 --title "FreeIPA Admin User Prompt" 3>&1 1>&2 2>&3)
+      freeipa_password=$(whiptail --passwordbox "Please enter the password for the FreeIPA admin user: $freeipa_admin" 8 78 --title "FreeIPA Password Prompt" 3>&1 1>&2 2>&3)
+      ipa-client-install --mkhomedir --no-ntp --principal="$freeipa_admin" --password="$freeipa_password" --enable-dns-updates --unattended
+    fi
+  else
+    echo "Skipping realm joining"
   fi
-else
-  echo "Skipping realm joining"
 fi