diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index 9935e995e..51fdf8ad3 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -27,7 +27,7 @@ export class AbstractApp {
 	}
 
 	remote() {
-		return null;
+		return this.Remote || null;
 	}
 
 	/**
diff --git a/dev/App/Admin.js b/dev/App/Admin.js
index 6c1db920f..1c4790d65 100644
--- a/dev/App/Admin.js
+++ b/dev/App/Admin.js
@@ -2,7 +2,6 @@ import 'External/Admin/ko';
 
 import { Settings, SettingsGet } from 'Common/Globals';
 
-import { AppAdminStore } from 'Stores/Admin/App';
 import Remote from 'Remote/Admin/Fetch';
 
 import { SettingsAdminScreen } from 'Screen/Admin/Settings';
@@ -14,10 +13,7 @@ import { AbstractApp } from 'App/Abstract';
 class AdminApp extends AbstractApp {
 	constructor() {
 		super(Remote);
-	}
-
-	remote() {
-		return Remote;
+		this.weakPassword = ko.observable(false);
 	}
 
 	bootend() {
@@ -27,19 +23,16 @@ class AdminApp extends AbstractApp {
 	bootstart() {
 		super.bootstart();
 
-		AppAdminStore.populate();
-
 		this.hideLoading();
 
 		if (!Settings.app('allowAdminPanel')) {
 			rl.route.root();
 			setTimeout(() => location.href = '/', 1);
+		} else if (SettingsGet('Auth')) {
+			this.weakPassword(!!SettingsGet('WeakPassword'));
+			startScreens([SettingsAdminScreen]);
 		} else {
-			if (SettingsGet('Auth')) {
-				startScreens([SettingsAdminScreen]);
-			} else {
-				startScreens([LoginAdminScreen]);
-			}
+			startScreens([LoginAdminScreen]);
 		}
 
 		this.bootend();
diff --git a/dev/App/User.js b/dev/App/User.js
index eda07b709..826002b6f 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -136,10 +136,6 @@ class AppUser extends AbstractApp {
 		shortcuts.add('escape,enter', '', KeyState.All, () => rl.Dropdowns.detectVisibility());
 	}
 
-	remote() {
-		return Remote;
-	}
-
 	reload() {
 		(Settings.app('inIframe') ? parent : window).location.reload();
 	}
diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js
index cd56adfad..d3aeaec89 100644
--- a/dev/Settings/Admin/General.js
+++ b/dev/Settings/Admin/General.js
@@ -19,7 +19,6 @@ import Remote from 'Remote/Admin/Fetch';
 
 import { ThemeStore } from 'Stores/Theme';
 import { LanguageStore } from 'Stores/Language';
-import { AppAdminStore } from 'Stores/Admin/App';
 import LanguagesPopupView from 'View/Popup/Languages';
 
 export class GeneralAdminSettings {
@@ -47,12 +46,13 @@ export class GeneralAdminSettings {
 			capaAdditionalAccounts: Settings.capa(Capa.AdditionalAccounts),
 			capaIdentities: Settings.capa(Capa.Identities),
 			capaAttachmentThumbnails: Settings.capa(Capa.AttachmentThumbnails),
-			capaTemplates: Settings.capa(Capa.Templates)
+			capaTemplates: Settings.capa(Capa.Templates),
+			dataFolderAccess: false
 		});
 
-		this.weakPassword = AppAdminStore.weakPassword;
+		this.weakPassword = rl.app.weakPassword;
 
-		this.dataFolderAccess = AppAdminStore.dataFolderAccess;
+//		fetch('./data/VERSION?' + Math.random()).then(response => this.dataFolderAccess(response.ok));
 
 		this.mainAttachmentLimit = ko
 			.observable(pInt(SettingsGet('AttachmentLimit')) / (1024 * 1024))
diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index 185cd4aee..9fbf2e3ed 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -2,15 +2,13 @@ import { Capa } from 'Common/Enums';
 import { Settings, SettingsGet } from 'Common/Globals';
 import { addObservablesTo, addSubscribablesTo } from 'Common/Utils';
 
-import { AppAdminStore } from 'Stores/Admin/App';
-
 import Remote from 'Remote/Admin/Fetch';
 
 import { decorateKoCommands } from 'Knoin/Knoin';
 
 export class SecurityAdminSettings {
 	constructor() {
-		this.weakPassword = AppAdminStore.weakPassword;
+		this.weakPassword = rl.app.weakPassword;
 
 		addObservablesTo(this, {
 			useLocalProxyForExternalImages: !!SettingsGet('UseLocalProxyForExternalImages'),
diff --git a/dev/Stores/Admin/App.js b/dev/Stores/Admin/App.js
deleted file mode 100644
index 26d79ed4d..000000000
--- a/dev/Stores/Admin/App.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import ko from 'ko';
-import { SettingsGet } from 'Common/Globals';
-
-export const AppAdminStore = {
-	weakPassword: ko.observable(false),
-	dataFolderAccess: ko.observable(false),
-
-	populate: function() {
-		this.weakPassword(!!SettingsGet('WeakPassword'));
-/*
-		SettingsGet('WeakPassword')
-			&& fetch('./data/VERSION?' + Math.random()).then(() => this.dataFolderAccess(true));
-*/
-	}
-};