diff --git a/scripts/adlsgen2setup.py b/scripts/adlsgen2setup.py
index 02cf860a85..98fd265c6f 100644
--- a/scripts/adlsgen2setup.py
+++ b/scripts/adlsgen2setup.py
@@ -135,8 +135,11 @@ async def create_or_get_group(self, group_name: str):
                 logging.info(f"Could not find group {group_name}, creating...")
                 group = {
                     "displayName": group_name,
-                    "groupTypes": ["Unified"],
                     "securityEnabled": self.security_enabled_groups,
+                    "groupTypes": ["Unified"],
+                    # If Unified does not work for you, then you may need the following settings instead:
+                    # "mailEnabled": False,
+                    # "mailNickname": group_name,
                 }
                 async with session.post("https://graph.microsoft.com/v1.0/groups", json=group) as response:
                     content = await response.json()
diff --git a/scripts/adlsgen2setup.sh b/scripts/adlsgen2setup.sh
index 6118a5e8e6..119379212c 100755
--- a/scripts/adlsgen2setup.sh
+++ b/scripts/adlsgen2setup.sh
@@ -2,7 +2,7 @@
 
 . ./scripts/loadenv.sh
 
-if [ -n "$AZURE_ADLS_GEN2_STORAGE_ACCOUNT" ]; then
+if [ -z "$AZURE_ADLS_GEN2_STORAGE_ACCOUNT" ]; then
     echo 'AZURE_ADLS_GEN2_STORAGE_ACCOUNT must be set to continue'
     exit 1
 fi