diff --git a/auth_changepassword.php b/auth_changepassword.php
index dca32fd731..5a9a8e042e 100644
--- a/auth_changepassword.php
+++ b/auth_changepassword.php
@@ -318,26 +318,34 @@
 		$value = true;
 	} elseif (isset($ref_parts['host'])) {
 		$server_addr = $_SERVER['SERVER_ADDR'];
-		$server_info = dns_get_record($_SERVER['SERVER_NAME'], DNS_ANY);
-		$server_ref  = gethostbyname($ref_parts['host']);
+		if (!filter_var($_SERVER['SERVER_NAME'], FILTER_VALIDATE_IP)) {
+			$server_info = dns_get_record($_SERVER['SERVER_NAME'], DNS_ANY);
+			$server_ref  = gethostbyname($ref_parts['host']);
 
-		if ($server_ref != $server_addr) {
-			$valid = false;
-		}
+			if ($server_ref != $server_addr) {
+				$valid = false;
+			}
 
-		if (!$valid && sizeof($server_info)) {
-			foreach($server_info as $record) {
-				if (isset($record['host']) && $record['host'] == $server_ref) {
-					$valid = true;
-					break;
-				} elseif (isset($record['target']) && $record['target'] == $server_ref) {
-					$valid = true;
-					break;
-				} elseif (isset($record['id']) && $record['ip'] == $server_addr) {
-					$valid = true;
-					break;
+			if (!$valid && sizeof($server_info)) {
+				foreach($server_info as $record) {
+					if (isset($record['host']) && $record['host'] == $server_ref) {
+						$valid = true;
+						break;
+					} elseif (isset($record['target']) && $record['target'] == $server_ref) {
+						$valid = true;
+						break;
+					} elseif (isset($record['id']) && $record['ip'] == $server_addr) {
+						$valid = true;
+						break;
+					}
 				}
 			}
+		} else {
+			$server_ip   = gethostbyname($_SERVER['SERVER_NAME']);
+			$server_ref  = gethostbyname($ref_parts['host']);
+			if ($server_ip == $server_ref) {
+				$valid = true;
+			}
 		}
 	} else {
 		$valid = false;
diff --git a/lib/utility.php b/lib/utility.php
index 8fd5d45857..a858e8daf1 100644
--- a/lib/utility.php
+++ b/lib/utility.php
@@ -952,7 +952,7 @@ function utilities_get_mysql_recommendations() {
 			'class' => 'warning',
 			'measure' => 'ge',
 			'comment' => __('MySQL 5.6+ and MariaDB 10.0+ are great releases, and are very good versions to choose. Make sure you run the very latest release though which fixes a long standing low level networking issue that was causing spine many issues with reliability.')
-			)
+		)
 	);
 
 	if (isset($variables['innodb_version']) && version_compare($variables['innodb_version'], '5.6', '<')) {
@@ -993,7 +993,9 @@ function utilities_get_mysql_recommendations() {
 		);
 	} else {
 		if (version_compare($link_ver, '5.2', '>=')) {
-			if (!isset($variables['innodb_version'])) {
+			if (!isset($variables['innodb_version']) && 
+				($database == 'MySQL' || ($database == 'MariaDB' && version_compare($link_ver, '11.0', '<')))) {
+
 				$recommendations += array(
 					'innodb' => array(
 						'value' => 'ON',