diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index f70dbfb16..8ce28cd1b 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -1,36 +1,3 @@
-<!-- Modal developer mode -->
-<div class="modal fade" id="developerModeChangeModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" ng-hide="config.developerMode">Enable CLI</h4>
-                <h4 class="modal-title" ng-show="config.developerMode">Disable CLI</h4>
-            </div>
-            <div class="modal-body">
-                <form name="developerModeChangeForm" role="form" novalidate ng-submit="doChangeDeveloperMode(developerModeChangeForm)" autocomplete="off">
-                    <fieldset>
-                        <input type="password" style="display: none;">
-                        <div class="form-group" ng-class="{ 'has-error': (!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid) }">
-                            <label class="control-label" for="inputDeveloperModeChangePassword">Give your password to verify that you are performing that action</label>
-                            <div class="control-label" ng-show="(!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid)">
-                                <small ng-show=" developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid">A password is required</small>
-                                <small ng-show="!developerModeChangeForm.password.$dirty && developerModeChange.error.password">Wrong password</small>
-                            </div>
-                            <input type="password" class="form-control" ng-model="developerModeChange.password" id="inputDeveloperModeChangePassword" name="password" required autofocus>
-                        </div>
-                        <input class="ng-hide" type="submit" ng-disabled="developerModeChangeForm.$invalid"/>
-                    </fieldset>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger" ng-hide="config.developerMode" ng-click="doChangeDeveloperMode(developerModeChangeForm)" ng-disabled="developerModeChangeForm.$invalid || developerModeChange.busy"><i class="fa fa-spinner fa-pulse" ng-show="developerModeChange.busy"></i> Enable</button>
-                <button type="button" class="btn btn-success" ng-show="config.developerMode" ng-click="doChangeDeveloperMode(developerModeChangeForm)" ng-disabled="developerModeChangeForm.$invalid || developerModeChange.busy"><i class="fa fa-spinner fa-pulse" ng-show="developerModeChange.busy"></i> Disable</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <!-- Modal change avatar -->
 <div class="modal fade" id="avatarChangeModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -208,32 +175,5 @@
     </div>
 </div>
 
-<div class="section-header" ng-show="user.admin">
-    <div class="text-left">
-        <h3>API</h3>
-    </div>
-</div>
-
-<div class="card" style="margin-bottom: 15px;" ng-show="user.admin">
-    <div class="row">
-        <div class="col-xs-12">
-            The Cloudron <a href="https://cloudron.io/references/api.html" target="_blank">REST API</a> can be used to manage all aspects of the Cloudron like adding users and installing apps.
-            <br/>
-            <br/>
-            You can develop apps for the Cloudron using the <a href="https://cloudron.io/references/cli.html" target="_blank">CLI tool</a>. See the <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank">docs</a> for more information.
-        </div>
-    </div>
-    <br/>
-    <div class="row">
-        <div class="col-xs-6">
-            Status
-        </div>
-        <div class="col-xs-6 text-right">
-            <a href="" class="text-danger" ng-show="config.developerMode" ng-click="showChangeDeveloperMode()">Enabled</a>
-            <a href="" ng-hide="config.developerMode" ng-click="showChangeDeveloperMode()">Disabled</a>
-        </div>
-    </div>
-</div>
-
 <!-- Offset the footer -->
 <br/><br/>
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index 4989b375d..6de9a46dc 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -26,12 +26,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         requestedPlan: null
     };
 
-    $scope.developerModeChange = {
-        busy: false,
-        error: {},
-        password: ''
-    };
-
     $scope.createBackup = {
         busy: false,
         percent: 100
@@ -203,38 +197,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         });
     };
 
-    function developerModeChangeReset () {
-        $scope.developerModeChange.error.password = null;
-        $scope.developerModeChange.password = '';
-
-        $scope.developerModeChangeForm.$setPristine();
-        $scope.developerModeChangeForm.$setUntouched();
-    }
-
-    $scope.doChangeDeveloperMode = function () {
-        $scope.developerModeChange.error.password = null;
-        $scope.developerModeChange.busy = true;
-
-        Client.changeDeveloperMode(!$scope.config.developerMode, $scope.developerModeChange.password, function (error) {
-            if (error) {
-                if (error.statusCode === 403) {
-                    $scope.developerModeChange.error.password = true;
-                    $scope.developerModeChange.password = '';
-                    $scope.developerModeChangeForm.password.$setPristine();
-                    $('#inputDeveloperModeChangePassword').focus();
-                } else {
-                    console.error('Unable to change developer mode.', error);
-                }
-            } else {
-                developerModeChangeReset();
-
-                $('#developerModeChangeModal').modal('hide');
-            }
-
-            $scope.developerModeChange.busy = false;
-        });
-    };
-
     function getBlobFromImg(img, callback) {
         var size = 256;
 
@@ -278,7 +240,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         $scope.avatarChange.avatar.file = getBlobFromImg(img, function (blob) {
             Client.changeCloudronAvatar(blob, function (error) {
                 if (error) {
-                    console.error('Unable to change developer mode.', error);
+                    console.error('Unable to change cloudron avatar.', error);
                 } else {
                     Client.resetAvatar();
                 }
@@ -321,11 +283,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         });
     };
 
-    $scope.showChangeDeveloperMode = function () {
-        developerModeChangeReset();
-        $('#developerModeChangeModal').modal('show');
-    };
-
     $scope.showCreateBackup = function () {
         $('#createBackupModal').modal('show');
     };
@@ -361,7 +318,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     });
 
     // setup all the dialog focus handling
-    ['developerModeChangeModal', 'planChangeModal'].forEach(function (id) {
+    ['planChangeModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });
diff --git a/webadmin/src/views/tokens.html b/webadmin/src/views/tokens.html
index 74bbc247f..3c397e0e9 100644
--- a/webadmin/src/views/tokens.html
+++ b/webadmin/src/views/tokens.html
@@ -1,3 +1,35 @@
+<!-- Modal developer mode -->
+<div class="modal fade" id="developerModeChangeModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" ng-hide="config.developerMode">Enable API Access</h4>
+                <h4 class="modal-title" ng-show="config.developerMode">Disable API Access</h4>
+            </div>
+            <div class="modal-body">
+                <form name="developerModeChangeForm" role="form" novalidate ng-submit="doChangeDeveloperMode(developerModeChangeForm)" autocomplete="off">
+                    <fieldset>
+                        <input type="password" style="display: none;">
+                        <div class="form-group" ng-class="{ 'has-error': (!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid) }">
+                            <label class="control-label" for="inputDeveloperModeChangePassword">Give your password to verify that you are performing that action</label>
+                            <div class="control-label" ng-show="(!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid)">
+                                <small ng-show=" developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid">A password is required</small>
+                                <small ng-show="!developerModeChangeForm.password.$dirty && developerModeChange.error.password">Wrong password</small>
+                            </div>
+                            <input type="password" class="form-control" ng-model="developerModeChange.password" id="inputDeveloperModeChangePassword" name="password" required autofocus>
+                        </div>
+                        <input class="ng-hide" type="submit" ng-disabled="developerModeChangeForm.$invalid"/>
+                    </fieldset>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-danger" ng-hide="config.developerMode" ng-click="doChangeDeveloperMode(developerModeChangeForm)" ng-disabled="developerModeChangeForm.$invalid || developerModeChange.busy"><i class="fa fa-spinner fa-pulse" ng-show="developerModeChange.busy"></i> Enable</button>
+                <button type="button" class="btn btn-success" ng-show="config.developerMode" ng-click="doChangeDeveloperMode(developerModeChangeForm)" ng-disabled="developerModeChangeForm.$invalid || developerModeChange.busy"><i class="fa fa-spinner fa-pulse" ng-show="developerModeChange.busy"></i> Disable</button>
+            </div>
+        </div>
+    </div>
+</div>
 
 <!-- Modal add client -->
 <div class="modal fade" id="clientAddModal" tabindex="-1" role="dialog">
@@ -82,6 +114,36 @@
 
 <br/>
 
+
+<div class="section-header" ng-show="user.admin">
+    <div class="text-left">
+        <h3>API</h3>
+    </div>
+</div>
+
+<div class="card" style="margin-bottom: 15px;" ng-show="user.admin">
+    <div class="row">
+        <div class="col-xs-12">
+            The Cloudron <a href="https://cloudron.io/references/api.html" target="_blank">REST API</a> can be used to manage all aspects of the Cloudron like adding users and installing apps.
+            <br/>
+            <br/>
+            You can develop apps for the Cloudron using the <a href="https://cloudron.io/references/cli.html" target="_blank">CLI tool</a>. See the <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank">docs</a> for more information.
+        </div>
+    </div>
+    <br/>
+    <div class="row">
+        <div class="col-xs-6">
+            Status
+        </div>
+        <div class="col-xs-6 text-right">
+            <a href="" class="text-danger" ng-show="config.developerMode" ng-click="showChangeDeveloperMode()">Enabled</a>
+            <a href="" ng-hide="config.developerMode" ng-click="showChangeDeveloperMode()">Disabled</a>
+        </div>
+    </div>
+</div>
+
+<br/>
+
 <div class="section-header">
     <div class="text-left">
         <h3>Personal access tokens <button class="btn btn-xs btn-primary btn-outline pull-right" ng-click="tokenAdd.show(apiClient)"><i class="fa fa-plus"></i> New Token</button> </h3>
diff --git a/webadmin/src/views/tokens.js b/webadmin/src/views/tokens.js
index 549c1f714..c0967e69d 100644
--- a/webadmin/src/views/tokens.js
+++ b/webadmin/src/views/tokens.js
@@ -8,6 +8,49 @@ angular.module('Application').controller('TokensController', ['$scope', 'Client'
     $scope.apiClient = {};
     $scope.tokenInUse = null;
 
+    $scope.developerModeChange = {
+        busy: false,
+        error: {},
+        password: ''
+    };
+
+    function developerModeChangeReset () {
+        $scope.developerModeChange.error.password = null;
+        $scope.developerModeChange.password = '';
+
+        $scope.developerModeChangeForm.$setPristine();
+        $scope.developerModeChangeForm.$setUntouched();
+    }
+
+    $scope.doChangeDeveloperMode = function () {
+        $scope.developerModeChange.error.password = null;
+        $scope.developerModeChange.busy = true;
+
+        Client.changeDeveloperMode(!$scope.config.developerMode, $scope.developerModeChange.password, function (error) {
+            if (error) {
+                if (error.statusCode === 403) {
+                    $scope.developerModeChange.error.password = true;
+                    $scope.developerModeChange.password = '';
+                    $scope.developerModeChangeForm.password.$setPristine();
+                    $('#inputDeveloperModeChangePassword').focus();
+                } else {
+                    console.error('Unable to change developer mode.', error);
+                }
+            } else {
+                developerModeChangeReset();
+
+                $('#developerModeChangeModal').modal('hide');
+            }
+
+            $scope.developerModeChange.busy = false;
+        });
+    };
+
+    $scope.showChangeDeveloperMode = function () {
+        developerModeChangeReset();
+        $('#developerModeChangeModal').modal('show');
+    };
+
     $scope.clientAdd = {
         busy: false,
         error: {},
@@ -183,7 +226,7 @@ angular.module('Application').controller('TokensController', ['$scope', 'Client'
     Client.onReady(refresh);
 
     // setup all the dialog focus handling
-    ['clientAddModal'].forEach(function (id) {
+    ['developerModeChangeModal', 'clientAddModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });