diff --git a/core/install/install.php b/core/install/install.php
index b299ef25fc..6d70c4f0ad 100644
--- a/core/install/install.php
+++ b/core/install/install.php
@@ -204,9 +204,6 @@
 		include "resources/page_parts/install_select_language.php";
 		echo "	<input type='hidden' name='return_install_step' value='select_language'/>\n";
 		echo "	<input type='hidden' name='install_step' value='detect_config'/>\n";
-		echo "	<div style='text-align:right'>\n";
-		echo "    <input type='submit' class='btn' id='next' value='".$text['button-next']."'>\n";
-		echo "	</div>\n";
 		echo "</form>\n";
 	} elseif($install_step == 'detect_config'){
 		if(!($event_host == '' || $event_host == 'localhost' || $event_host == '::1' || $event_host == '127.0.0.1' )){
diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 5f202789ab..a73d217456 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -386,12 +386,11 @@
 		//create the menu array
 			function menu_array($sql, $menu_item_level) {
 
-				//get the database connnection return immediately if it doesn't exist
-					if ($this->db) {
-						$db = $this->db;
-					}else {
-						return;
-					}
+				//get the database connnection
+					$db = $this->db;
+
+				//database ojbect does not exist return immediately
+					if (!$db) { return; }
 
 				//if there are no groups then set the public group
 					if (!isset($_SESSION['groups'])) {
@@ -460,12 +459,11 @@
 		//create the sub menus
 			function menu_child_array($menu_item_level, $menu_item_uuid) {
 
-				//get the database connnection return immediately if it doesn't exist
-					if ($this->db) {
-						$db = $this->db;
-					}else {
-						return;
-					}
+				//get the database connnection
+					$db = $this->db;
+
+				//database ojbect does not exist return immediately
+					if (!$db) { return; }
 
 				//set the level
 					$menu_item_level = $menu_item_level+1;