diff --git a/linupx-scripts.sh b/linupx-scripts.sh
index 64bfbc9..04de085 100755
--- a/linupx-scripts.sh
+++ b/linupx-scripts.sh
@@ -465,7 +465,7 @@ POSTFIX_INSTALL(){
 		wget https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/defaults/sender_canonical -O /etc/postfix/sender_canonical
 		
 		hostname=`hostname`
-		echo -e -n "${idsCL[LightCyan]}Server Name (Default=${hostname}): ${idsCL[Default]}"
+		echo -e -n "${idsCL[LightCyan]}Server Name (Default = "${hostname}"): ${idsCL[Default]}"
 		read pfhostname
 		echo ""
 	
@@ -473,9 +473,13 @@ POSTFIX_INSTALL(){
 			pfhostname=${hostname}
 		fi
 		
-		read -p "Default from email (portion before @scity.us): " pffromemail
+		read -p "Default from email (portion before @scity.us, Default = "${hostname}"): " pffromemail
 		echo ""
 		
+		if [ "${pffromemail}" = "" ]; then
+			pffromemail=${hostname}
+		fi
+		
 		sed -i "s/<<HOSTNAME>>/${pfhostname}/g" main.cf
 		sed -i "s/<<FROMEMAIL>>/${pffromemail}/g" sender_canonical