diff --git a/install/js/install.js b/install/js/install.js
index 2bd852271a..d22e97af81 100644
--- a/install/js/install.js
+++ b/install/js/install.js
@@ -274,12 +274,16 @@ InstallScript.prototype.step5 = function() {
 		}
 	});
 	$('[name="smtpSecurity"]').change( function(e){
-		if ($(this).val() == '') {
-			$('[name="smtpPort"]').val('25');
-		}
-		else {
-			$('[name="smtpPort"]').val('465');
+
+		var smtpPorts = {
+			"": "25",
+			"SSL": "465",
+			"TLS": "587"
 		}
+
+		var portVal = $(this).val();
+
+		$('[name="smtpPort"]').val(smtpPorts[portVal]);
 	});
 }