diff --git a/appinfo/app.php b/appinfo/app.php
index cc76ce42..465cb990 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -12,10 +12,6 @@
  *
  */
 
-
-// --- register settings -----------------------------------------------
-\OCP\App::registerAdmin('search_elastic', 'settings/admin');
-
 $mode = \OC::$server->getConfig()->getAppValue('search_elastic', 'mode', 'active');
 if ($mode === 'active') {
 	// --- add js & css -----------------------------------------------
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9d2c447b..ebd9bf3f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<licence>Commercial</licence>
 	<author>ownCloud Inc.</author>
 	<dependencies>
-		<owncloud min-version="9.0" max-version="9.1" />
+		<owncloud min-version="10.0" max-version="10.0" />
 	</dependencies>
 	<types>
 		<filesystem/>
@@ -15,5 +15,8 @@
 	<description>This app uses a separate elasticsearch cluster to enable
 		searching in content and meta data of files.
 	</description>
+	<settings>
+		<admin>OCA\search_elastic\AdminPanel</admin>
+	</settings>
 </info>
 
diff --git a/lib/adminpanel.php b/lib/adminpanel.php
new file mode 100644
index 00000000..31cf87b5
--- /dev/null
+++ b/lib/adminpanel.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Jörn Friedrich Dreyer <jfd@owncloud.com>
+ * @copyright (C) 2017 ownCloud GmbH
+ *
+ * This code is covered by the ownCloud Commercial License.
+ *
+ * You should have received a copy of the ownCloud Commercial License
+ * along with this program. If not, see <https://owncloud.com/licenses/owncloud-commercial/>.
+ *
+ */
+
+namespace OCA\search_elastic;
+
+use OCP\Settings\ISettings;
+
+class AdminPanel implements ISettings {
+
+	public function getPanel() {
+		return new \OCP\Template('search_elastic', 'settings/admin');
+	}
+
+	public function getSectionID() {
+		return 'search';
+	}
+
+	public function getPriority() {
+		return 50;
+	}
+
+}
+
+
diff --git a/settings/admin.php b/settings/admin.php
deleted file mode 100644
index 5f939fd5..00000000
--- a/settings/admin.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Jörn Friedrich Dreyer <jfd@owncloud.com>
- * @copyright (C) 2014-2016 ownCloud, Inc.
- *
- * This code is covered by the ownCloud Commercial License.
- *
- * You should have received a copy of the ownCloud Commercial License
- * along with this program. If not, see <https://owncloud.com/licenses/owncloud-commercial/>.
- *
- */
-
-\OC_Util::checkAdminUser();
-
-\OCP\Util::addStyle('search_elastic', 'settings/admin');
-\OCP\Util::addScript('search_elastic', 'settings/admin');
-
-$tmpl = new \OCP\Template('search_elastic', 'settings/admin');
-
-return $tmpl->fetchPage();
diff --git a/templates/settings/admin.php b/templates/settings/admin.php
index 09abf8ab..6f9c2d88 100644
--- a/templates/settings/admin.php
+++ b/templates/settings/admin.php
@@ -1,6 +1,10 @@
+<?php
+script('search_elastic', 'settings/admin');
+style('search_elastic', 'settings/admin');
+?>
 <div class="section" id="searchElasticSettings" >
 
-	<h2><?php p($l->t('Elasticsearch'));?></h2>
+	<h2 class="appname"><?php p($l->t('Elasticsearch'));?></h2>
 	<div>
 		<span class="icon"></span>