diff --git a/src/js/app-config.js b/src/js/app-config.js
index 603d7fc..389cd79 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -17,7 +17,19 @@ appCfg.config = {
     privkeyServerUrl: 'https://keychain.whiteout.io',
     adminUrl: 'https://admin-node.whiteout.io',
     settingsUrl: 'https://settings.whiteout.io/autodiscovery/',
-    wmailDomain: 'wmail.io',
+    mailServer: {
+        domain: 'wmail.io',
+        imap: {
+            hostname: 'imap.wmail.io',
+            port: 993,
+            secure: true
+        },
+        smtp: {
+            hostname: 'smtp.wmail.io',
+            port: 465,
+            secure: true
+        }
+    },
     oauthDomains: [/\.gmail\.com$/, /\.googlemail\.com$/],
     ignoreUploadOnSentDomains: [/\.gmail\.com$/, /\.googlemail\.com$/],
     serverPrivateKeyId: 'EE342F0DDBB0F3BE',
diff --git a/src/js/controller/login/create-account.js b/src/js/controller/login/create-account.js
index faa206f..1556b6d 100644
--- a/src/js/controller/login/create-account.js
+++ b/src/js/controller/login/create-account.js
@@ -5,6 +5,7 @@ var CreateAccountCtrl = function($scope, $location, $routeParams, $q, auth, admi
 
     // init phone region
     $scope.region = 'DE';
+    $scope.domain = '@' + appConfig.config.mailServer.domain;
 
     $scope.createWhiteoutAccount = function() {
         if ($scope.form.$invalid) {
@@ -19,7 +20,7 @@ var CreateAccountCtrl = function($scope, $location, $routeParams, $q, auth, admi
 
         }).then(function() {
             // read form values
-            var emailAddress = $scope.user + '@' + appConfig.config.wmailDomain;
+            var emailAddress = $scope.user + $scope.domain;
             var phone = PhoneNumber.Parse($scope.dial, $scope.region);
             if (!phone || !phone.internationalNumber) {
                 throw new Error('Invalid phone number!');
@@ -50,6 +51,15 @@ var CreateAccountCtrl = function($scope, $location, $routeParams, $q, auth, admi
             $scope.errMsg = err.errMsg || err.message;
         });
     };
+
+    $scope.loginToExisting = function() {
+        // set server config
+        $scope.state.login = {
+            mailConfig: appConfig.config.mailServer
+        };
+        // proceed to login
+        $location.path('/login-set-credentials');
+    };
 };
 
 module.exports = CreateAccountCtrl;
\ No newline at end of file
diff --git a/src/sass/blocks/basics/_form.scss b/src/sass/blocks/basics/_form.scss
index 5b1c1de..b2a56e1 100644
--- a/src/sass/blocks/basics/_form.scss
+++ b/src/sass/blocks/basics/_form.scss
@@ -105,6 +105,7 @@
     font-size: $font-size-base;
     padding: 0.5em 0.7em;
     outline: none;
+    box-shadow: none;
     // ios
     border-radius: 0;
     -webkit-appearance: none;
diff --git a/src/tpl/create-account.html b/src/tpl/create-account.html
index 13f98c5..cc5fb7e 100644
--- a/src/tpl/create-account.html
+++ b/src/tpl/create-account.html
@@ -5,15 +5,15 @@
     </header>
     <main class="page__main">
       <h2 class="typo-title">Create Whiteout account</h2>
-      <p class="typo-paragraph">Please fill out the following form. You will need a <em>beta access code</em> during the private beta period. To participate in the private beta please <a href="http://eepurl.com/ba09in" target="_blank">sign up</a>.</p>
+      <p class="typo-paragraph">Sign up for an encrypted mailbox hosted in Germany.<br>Already have an account? <a href="#" wo-touch="$event.preventDefault(); loginToExisting()">Log in here</a>.</p>
       <form class="form" name="form">
         <p class="form__error-message" ng-show="errMsg">{{errMsg}}</p>
         <div class="form__row">
           <div class="input-email-fixed-domain">
-            <input class="input-text" ng-model="user" required type="text" wo-focus-me="true" tabindex="1"
+            <input class="input-text" ng-model="user" required type="text" tabindex="1"
               pattern='[a-zA-Z0-9\.]+' placeholder="User name"
               autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">
-            <span>@wmail.io</span>
+            <span>{{domain}}</span>
           </div>
         </div>
         <div class="form__row">
@@ -288,7 +288,7 @@
           </div>
         </div>
         <div class="form__row">
-          <input class="input-text" type="text" ng-model="betaCode" required placeholder="Beta access code" tabindex="6">
+          <input class="input-text" type="text" ng-model="betaCode" required placeholder="Beta access code (for private beta)" tabindex="6">
         </div>
         <div class="spinner-block" ng-show="busy">
           <span class="spinner spinner--big"></span>
@@ -297,6 +297,9 @@
           <button class="btn" type="submit" ng-click="createWhiteoutAccount()">Create</button>
         </div>
       </form>
+      <p class="typo-paragraph">
+        <a href="http://eepurl.com/ba09in" target="_blank" title="Sign up for private beta access.">Need a beta access code?</a>
+      </p>
     </main>
     <div ng-include="'tpl/page-footer.html'"></div>
   </div>
diff --git a/src/tpl/login-set-credentials.html b/src/tpl/login-set-credentials.html
index 3f8f722..66589cc 100644
--- a/src/tpl/login-set-credentials.html
+++ b/src/tpl/login-set-credentials.html
@@ -32,7 +32,7 @@
         </div>
         <div class="form__row">
           <input class="input-text" type="text" ng-model="realname"
-            placeholder="Full name (optional)" wo-focus-me="true" tabindex="2">
+            placeholder="Full name (optional)" tabindex="2">
         </div>
         <div class="form__row" ng-hide="useOAuth">
           <input ng-required="!useOAuth" class="input-text" type="password"