diff --git a/.travis.yml b/.travis.yml
index 208ff7f96..4ecc24d18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@
 branches:
   only:
   - master
+  - 2.0.0
 language: node_js
 node_js: 10
 addons:
diff --git a/appveyor.yml b/appveyor.yml
index f71cea1b7..48d00c8db 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,7 @@
 branches:
   only:
   - master
+  - 2.0.0
 skip_tags: true
 os: unstable
 platform:
diff --git a/electron-builder.yml b/electron-builder.yml
index d90bf34c3..d3ad6fe41 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -3,6 +3,7 @@ artifactName: ${name}-${version}-${os}-${arch}.${ext}
 
 publish: {provider: github, releaseType: draft, vPrefixedTagName: true}
 forceCodeSigning: false
+generateUpdatesFilesForAllChannels: true
 
 # TODO consider moving fully bundable "dependencies" to "devDependencies" to reduce final package size
 
diff --git a/package.json b/package.json
index 2ca4ee8b2..b058fc9ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "email-securely-app",
   "description": "Unofficial desktop app for E2E encrypted email providers",
-  "version": "1.5.5",
+  "version": "2.0.0-beta.7",
   "author": "Vladimir Yakovlev <desktop-app@protonmail.ch>",
   "license": "MIT",
   "homepage": "https://github.com/vladimiry/email-securely-app",
diff --git a/src/electron-main/app-update.ts b/src/electron-main/app-update.ts
index bb64368d9..487d62724 100644
--- a/src/electron-main/app-update.ts
+++ b/src/electron-main/app-update.ts
@@ -2,6 +2,8 @@ import logger from "electron-log";
 import {autoUpdater} from "electron-updater";
 
 export function initAutoUpdate() {
+    autoUpdater.channel = "beta";
+    autoUpdater.allowDowngrade = false;
     autoUpdater.logger = logger;
     autoUpdater.checkForUpdatesAndNotify();
 }
diff --git a/src/web/src/app/_accounts/account.component.ts b/src/web/src/app/_accounts/account.component.ts
index 88ff7602e..4ece1e289 100644
--- a/src/web/src/app/_accounts/account.component.ts
+++ b/src/web/src/app/_accounts/account.component.ts
@@ -21,7 +21,6 @@ import {ACCOUNTS_ACTIONS, NAVIGATION_ACTIONS} from "src/web/src/app/store/action
 import {APP_NAME, ONE_SECOND_MS} from "src/shared/constants";
 import {AccountConfig} from "src/shared/model/account";
 import {AccountsSelectors, OptionsSelectors} from "src/web/src/app/store/selectors";
-import {BuildEnvironment} from "src/shared/model/common";
 import {DbViewModuleResolve} from "./db-view-module-resolve.service";
 import {IPC_MAIN_API_NOTIFICATION_ACTIONS} from "src/shared/api/main";
 import {NgChangesObservableComponent} from "src/web/src/app/components/ng-changes-observable.component";
@@ -252,10 +251,6 @@ export class AccountComponent extends NgChangesObservableComponent implements On
                     })),
                 );
 
-                if ((process.env.NODE_ENV as BuildEnvironment) !== "development") {
-                    return;
-                }
-
                 this.domReadySubscription.add(
                     ((state: { stopSyncingDeferred?: Deferred<void> } = {}) => {
                         return this.account$
diff --git a/src/web/src/app/_options/account-edit.component.html b/src/web/src/app/_options/account-edit.component.html
index 89ff02a13..70686120a 100644
--- a/src/web/src/app/_options/account-edit.component.html
+++ b/src/web/src/app/_options/account-edit.component.html
@@ -6,7 +6,7 @@
                 <span *ngIf="account; else label">{{ account.login }}</span>
                 <ng-template #label>Add Account</ng-template>
             </div>
-            <div class="form-check float-md-right" *ngIf="typeControlDisplayable && controls.type.value == 'tutanota'">
+            <div class="form-check float-md-right">
                 <label class="form-check-label">
                     <input type="checkbox" class="form-check-input" formControlName="database">
                     Local store
diff --git a/src/web/src/app/_options/account-edit.component.ts b/src/web/src/app/_options/account-edit.component.ts
index c2df4c938..7a824cb43 100644
--- a/src/web/src/app/_options/account-edit.component.ts
+++ b/src/web/src/app/_options/account-edit.component.ts
@@ -35,8 +35,6 @@ export class AccountEditComponent implements OnInit, OnDestroy {
         mailPassword: new FormControl(null),
     };
     form = new FormGroup(this.controls);
-    // TODO release: remove temporary "typeControlDisplayable" property
-    typeControlDisplayable: boolean = false;
     // account
     account?: AccountConfig;
     account$: Observable<AccountConfig> = merge(this.activatedRoute.params, this.activatedRoute.queryParams).pipe(
@@ -52,11 +50,7 @@ export class AccountEditComponent implements OnInit, OnDestroy {
 
     constructor(private optionsService: OptionsService,
                 private store: Store<State>,
-                private activatedRoute: ActivatedRoute) {
-        if ((process.env.NODE_ENV/* as BuildEnvironment*/) === "development") {
-            this.typeControlDisplayable = true;
-        }
-    }
+                private activatedRoute: ActivatedRoute) {}
 
     ngOnInit() {
         const {controls} = this;