diff --git a/database.sql b/database.sql
index fa4f1bd58b..6ba4921cb7 100644
--- a/database.sql
+++ b/database.sql
@@ -606,7 +606,7 @@ CREATE TABLE IF NOT EXISTS `item_id` (
 -- Table structure for table `locks`
 --
 
-CREATE TABLE `locks` (
+CREATE TABLE IF NOT EXISTS `locks` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` char(128) NOT NULL,
   `locked` tinyint(1) NOT NULL DEFAULT '0',
diff --git a/mod/install.php b/mod/install.php
index cb21a71ebe..4e4631b85f 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -60,7 +60,7 @@ function install_post(&$a) {
 
 			return; 
 			break;
-		case 4;
+		case 4:
 			$urlpath = $a->get_path();
 			$dbhost = notags(trim($_POST['dbhost']));
 			$dbuser = notags(trim($_POST['dbuser']));
@@ -155,11 +155,11 @@ function install_content(&$a) {
 	}
 
 	if(x($a->data,'txt') && strlen($a->data['txt'])) {
-		$tpl = get_markup_template('install.tpl');
 		$db_return_text .= manual_config($a);
 	}
 	
 	if ($db_return_text!="") {
+		$tpl = get_markup_template('install.tpl');
 		return replace_macros($tpl, array(
 			'$title' => $install_title,
 			'$pass' => "",