diff --git a/setup/so-functions b/setup/so-functions
index 6d46b4bb4..410cc5970 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -470,7 +470,7 @@ collect_int_ip_mask() {
 collect_mngr_hostname() {
 	whiptail_management_server
 
-	while ! valid_hostname "$MSRV"; do
+	while ! valid_hostname "$MSRV" || [[ $MSRV == "$HOSTNAME" || $MSRVIP == "localhost" ]]; do
 		whiptail_invalid_hostname
 		whiptail_management_server "$MSRV"
 	done
@@ -478,7 +478,7 @@ collect_mngr_hostname() {
 	if ! getent hosts "$MSRV"; then
 		whiptail_manager_ip
 
-		while ! valid_ip4 "$MSRVIP"; do
+		while ! valid_ip4 "$MSRVIP" || [[ $MSRVIP == "$MAINIP" || $MSRVIP == "127.0.0.1" ]]; do
 			whiptail_invalid_input
 			whiptail_manager_ip "$MSRVIP"
 		done