diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index bd668ea3..08f4f56c 100644
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -66,7 +66,7 @@ if (!empty($serendipity['POST']['getstep']) && is_numeric($serendipity['POST']['
 }
 
 /* From configuration to install */
-if ( sizeof($_POST) > 1 && (int)$serendipity['GET']['step'] == 3 ) {
+if ( sizeof($_POST) > 1 && $serendipity['GET']['step'] == '3' ) {
     /* One problem, if the user chose to do an easy install, not all config vars has been transfered
        Therefore we fetch all config vars with their default values, and merge them with our POST data */
 
@@ -87,7 +87,7 @@ if ( sizeof($_POST) > 1 && (int)$serendipity['GET']['step'] == 3 ) {
         $serendipity['GET']['step'] = $serendipity['POST']['step'];
     } else {
         /* We're good, move to install process */
-        $serendipity['GET']['step'] = 3;
+        $serendipity['GET']['step'] = '3';
     }
 }
 
@@ -337,9 +337,7 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
     $data['ob_serendipity_printConfigTemplate'] = ob_get_contents();
     ob_end_clean();        
 
-} elseif ( (int)$serendipity['GET']['step'] == 3 ) { 
-
-    $data['getstepint3'] = true;
+} elseif ( $serendipity['GET']['step'] == '3' ) {
     $serendipity['dbPrefix'] = $_POST['dbPrefix'];
 
     $t = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}authors", false, 'both', false, false, false, true);
@@ -374,7 +372,9 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
 
     if ( serendipity_updateConfiguration() ) {
         $data['s9y_installed'] = true;
-    } 
+    }
+    echo serendipity_smarty_show("admin/installer.inc.tpl", $data);
+    return;
 }
 
 
diff --git a/templates/2k11/admin/installer.inc.tpl b/templates/2k11/admin/installer.inc.tpl
index f70bd5b2..c9cb813e 100644
--- a/templates/2k11/admin/installer.inc.tpl
+++ b/templates/2k11/admin/installer.inc.tpl
@@ -247,7 +247,7 @@
                 {if $ob_serendipity_printConfigTemplate}{$ob_serendipity_printConfigTemplate}{/if}
                 <input name="submit" type="submit" value="{$CONST.COMPLETE_INSTALLATION}">
             </form>
-        {elseif $getstepint3}
+        {elseif $s9yGETstep == '3'}
             <h3>{$CONST.CHECK_DATABASE_EXISTS}</h3>
             {if is_array($authors_query)}
             <span class="msg_success"><span class="icon-ok-circled"></span> <strong>{$CONST.THEY_DO}</strong>, {$CONST.WONT_INSTALL_DB_AGAIN}</span>