diff --git a/files/admin.php b/files/admin.php
index 861b6037f3..ea846202ab 100644
--- a/files/admin.php
+++ b/files/admin.php
@@ -25,7 +25,7 @@
 // Init owncloud
 require_once('../lib/base.php');
 
-OC_User::checkAdminUser();
+OC_Util::checkAdminUser();
 
 $htaccessWorking=(getenv('htaccessWorking')=='true');
 if(isset($_POST['maxUploadSize'])){
@@ -38,10 +38,10 @@ if(isset($_POST['maxUploadSize'])){
 }
 
 OC_App::setActiveNavigationEntry( "files_administration" );
-// return template
-$tmpl = new OC_Template( "files", "admin", "user" );
+
+$tmpl = new OC_Template( 'files', 'admin' );
 $tmpl->assign( 'htaccessWorking', $htaccessWorking );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->printPage();
+return $tmpl->fetchPage();
 
 ?>
diff --git a/files/templates/admin.php b/files/templates/admin.php
index 0122865ee7..eb65544704 100644
--- a/files/templates/admin.php
+++ b/files/templates/admin.php
@@ -1,10 +1,13 @@
 <?php OC_Util::addScript('files','admin'); ?>
 
 <form name="filesForm" action='#' method='post'>
+	<fieldset class="personalblock">
+		<legend><strong><?php echo $l->t('File handling');?></strong></legend>
 	<?php if($_['htaccessWorking']):?>
 		<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/><br/>
 		<input type='submit' value='Save'/>
 	<?php else:?>
 		No settings currently available.
 	<?php endif;?>
+	</fieldset>
 </form>
diff --git a/lib/app.php b/lib/app.php
index f841180eba..64cbe8894e 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -325,6 +325,7 @@ class OC_App{
 				$source=self::$settingsForms;
 				break;
 			case 'admin':
+				$forms[] = include 'files/admin.php';   //hardcode own apps
 				$source=self::$adminForms;
 				break;
 			case 'personal':
@@ -371,7 +372,7 @@ class OC_App{
 		}
 		return $apps;
 	}
-	
+
 	/**
 	 * check if any apps need updating and update those
 	 */
@@ -390,7 +391,7 @@ class OC_App{
 			}
 		}
 	}
-	
+
 	/**
 	 * update the database for the app and call the update script
 	 * @param string appid