diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php
index 394df38da7015c1bf73eb2c2ecbfc98c21401610..0a892d7d4bcbefd2673c76d8f6af125de31ee9ab 100644
--- a/inc/templates/adminform.php
+++ b/inc/templates/adminform.php
@@ -53,11 +53,11 @@ function dbtypechange(){
 </script>
 <?php
 if(!$FIRSTRUN){
-	$action=$WEBROOT.'/settings';
+	$action=$WEBROOT.'/settings/#system_settings';
 }else{
 	$action='#';
 }
-echo('<form method="post" enctype="multipart/form-data" action="'.$action.'">')
+echo('<form method="post" action="'.$action.'">')
 ?>
 <table cellpadding="5" cellspacing="5" border="0" class="loginform">
 <?php
@@ -134,7 +134,7 @@ if($CONFIG_DBTYPE=='sqlite'){
 <tr id='dbAdminPwd'><td>database administrative password:</td><td><input type="password" name="dbadminpwd" size="30" class="formstyle" value=''></input></td></tr>
 <tr id='dbfill'><td>automaticly fill initial database:</td><td><input type="checkbox" name="filldb" size="30" class="formstyle" value='1' <?php if($FIRSTRUN) echo 'checked="checked"'; ?>></input></td></tr>
 <?php }?>
-<tr><td></td><td><input type="submit" name="set_config" alt="save" value="save" class="formstyle" /></td></tr>
+<tr><td></td><td><input type="submit" name='set_config' alt="save" value="save" class="formstyle" /></td></tr>
 </table></form><br/>
 <?php
 if(!$FIRSTRUN ){//disabled for now?>
diff --git a/inc/templates/settings.php b/inc/templates/settings.php
index ef181164d04ef50cc0b02d0c8a0413f026eb0889..9a1876f98a1ab4f9a9676d0cde73ab6945cf5b07 100644
--- a/inc/templates/settings.php
+++ b/inc/templates/settings.php
@@ -5,6 +5,14 @@ function showForm(id){
 	form.setAttribute('class','settingsContent');
 }
 
+function showFormInit(){
+	var loc=document.location.toString();
+	if(loc.indexOf('#')!=-1){
+		var id=loc.substring(loc.indexOf('#')+1);
+		showForm(id);
+	}
+}
+
 function hideAllForms(){
 	forms=document.getElementById('settingsHolder').childNodes;
 	for(var i=0;i<forms.length;i++){
@@ -36,3 +44,6 @@ foreach(OC_CONFIG::$forms as $name=>$url){
 }
 ?>
 </div>
+<script type="text/javascript">
+OC_onload.add(showFormInit());
+</script>
\ No newline at end of file