diff --git a/src/server/admin/api/postHandler.js b/src/server/admin/api/postHandler.js
index c6bb645..52684d8 100644
--- a/src/server/admin/api/postHandler.js
+++ b/src/server/admin/api/postHandler.js
@@ -113,11 +113,23 @@ class POSTHandler {
                     reject( { 'code': 500, 'error': error } );
                 } );
             } else if ( call === 'createAdminAccount' ) {
-                db.writeDataSimple( 'admin', 'email', data.email )
+                db.writeDataSimple( 'admin', 'email', data.email, data ).then( resp => {
+                    resolve( resp );
+                } ).catch( error => {
+                    reject( { 'code': 500, 'error': error } );
+                } );
             } else if ( call === 'updateAdminAccount' ) {
-                // TODO: Finish
+                db.writeDataSimple( 'admin', 'email', data.email, data ).then( resp => {
+                    resolve( resp );
+                } ).catch( error => {
+                    reject( { 'code': 500, 'error': error } );
+                } );
             } else if ( call === 'deleteAdminAccount' ) {
-                // TODO: Finish
+                db.deleteDataSimple( 'admin', 'email', data.email ).then( resp => {
+                    resolve( resp );
+                } ).catch( error => {
+                    reject( { 'code': 500, 'error': error } );
+                } );
             } else if ( call === 'updateSettings' ) {
                 this.settings[ 'twoFA' ] = data.twoFA;
                 this.settings[ 'currency' ] = data.currency;
diff --git a/src/webapp/main/src/components/seatplan/editor/window.vue b/src/webapp/main/src/components/seatplan/editor/window.vue
index 8d6a09c..b33affb 100644
--- a/src/webapp/main/src/components/seatplan/editor/window.vue
+++ b/src/webapp/main/src/components/seatplan/editor/window.vue
@@ -132,7 +132,17 @@
                 };
 
                 // Auto save every 60s (60K ms)
-                this.autoSave = setInterval( this.saveDraft(), 60000 );
+                this.autoSave = setInterval( () => {
+                    const options = {
+                        method: 'post',
+                        body: JSON.stringify( { 'data':{ 'seatInfo': this.seatCountInfo, 'data': this.scaleDown( this.draggables ) }, 'location': sessionStorage.getItem( 'locationID' ) } ),
+                        headers: {
+                            'Content-Type': 'application/json',
+                            'charset': 'utf-8'
+                        }
+                    };
+                    fetch( localStorage.getItem( 'url' ) + '/admin/api/saveSeatplanDraft', options );
+                }, 60000 );
                 
                 /* 
                 Calculate scale factor (this adds support for differently sized screens)
diff --git a/src/webapp/main/src/views/admin/events/EditorView.vue b/src/webapp/main/src/views/admin/events/EditorView.vue
index 5a36600..06ecbe3 100644
--- a/src/webapp/main/src/views/admin/events/EditorView.vue
+++ b/src/webapp/main/src/views/admin/events/EditorView.vue
@@ -9,7 +9,7 @@
 
 <template>
     <div>
-        <h2>Seat Plan Editor</h2>
+        <h2>Seat Plan Editor ({{ location }})</h2>
         <window />
     </div>
 </template>
@@ -18,6 +18,11 @@
     import window from '@/components/seatplan/editor/window.vue';
 
     export default {
+        data () {
+            return {
+                location: '',
+            };
+        },
         components: {
             window,
         },
@@ -26,6 +31,7 @@
                 if ( !sessionStorage.getItem( 'locationID' ) ) {
                     this.$router.push( '/admin/locations' );
                 }
+                this.location = sessionStorage.getItem( 'locationID' );
             }
         },
         created() {