diff --git a/setup/so-functions b/setup/so-functions
index 568cfb092..f5a9233e8 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1137,15 +1137,16 @@ manager_global() {
                         "  airgap: False"\ >> "$global_pillar"
 		fi
 
+		WEBPASSWD1CLEAN=$(echo $WEBPASSWD1|sed -e "s/'/''/g")
         # Check if TheHive is enabled.  If so, add creds and other details
         if [[ "$THEHIVE" == "1" ]]; then
                 printf '%s\n'\
                         "  hiveuser: $WEBUSER"\
-                        "  hivepassword: '$WEBPASSWD1'"\
+                        "  hivepassword: '$WEBPASSWD1CLEAN'"\
                         "  hivekey: $HIVEKEY"\
                         "  hiveplaysecret: $HIVEPLAYSECRET"\
                         "  cortexuser: $WEBUSER"\
-                        "  cortexpassword: '$WEBPASSWD1'"\
+                        "  cortexpassword: '$WEBPASSWD1CLEAN'"\
                         "  cortexkey: $CORTEXKEY"\
                         "  cortexorgname: SecurityOnion"\
                         "  cortexorguser: soadmin"\