diff --git a/AUTHORS b/AUTHORS
index b7d5e30b5..f5c89fcc3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 The Mist Authors
 
-Alexandre Van de Sande <alex.vandesande@ethdev.com>
+Alexander Van de Sande <alex.vandesande@ethdev.com>
 Bas van Kervel <bas@ethdev.com>
-Fabian Vogelsteller <fabian@frozeman.de>
\ No newline at end of file
+Fabian Vogelsteller <fabian.vogelsteller@gmail.com>
\ No newline at end of file
diff --git a/interface/client/styles/onboardingScreen.import.less b/interface/client/styles/onboardingScreen.import.less
index 94d109253..5e4ccef44 100644
--- a/interface/client/styles/onboardingScreen.import.less
+++ b/interface/client/styles/onboardingScreen.import.less
@@ -7,7 +7,15 @@
     flex-direction: column;
     height: 100%;
     position: relative;
-    // background: lighten(@colorOSBackgroundFocus, 10%);    
+    // background: lighten(@colorOSBackgroundFocus, 10%);
+
+    .testnet-indicator {
+        position: absolute;
+        top: @gridWidth/2;
+        right: @gridHeight;
+        font-weight: 600;
+        opacity: 0.3;
+    }
     
     .main-content {
         z-index: 1;
diff --git a/interface/client/templates/popupWindows/onboardingScreen.html b/interface/client/templates/popupWindows/onboardingScreen.html
index 223583e03..6c255931f 100644
--- a/interface/client/templates/popupWindows/onboardingScreen.html
+++ b/interface/client/templates/popupWindows/onboardingScreen.html
@@ -1,6 +1,10 @@
 <template name="popupWindows_onboardingScreen">
     <div class="onboarding-screen {{mode}} active-{{TemplateVar.get 'currentActive'}} outgoing-{{TemplateVar.get 'lastActive'}} ">
         
+        {{#if TemplateVar.get "testnet"}}
+            <div class="testnet-indicator">TEST-NET</div>
+        {{/if}}
+
         <div class="main-content">    
             <div class="onboarding-section onboarding-start">
                 <p class="description">{{i18n "mist.popupWindows.onboarding.description"}}</p>
@@ -136,7 +140,6 @@ <h2 style="display: block; text-align: center;">{{i18n "mist.popupWindows.onboar
             {{else}}
                 <form action="about:blank" target="dapp-form-helper-iframe">
                     <input type="password" placeholder="{{i18n 'mist.popupWindows.requestAccount.enterPassword'}}" class="password">
-                    <input type="password" placeholder="{{i18n 'mist.popupWindows.requestAccount.repeatPassword'}}" class='password-repeat'>
                     <br><br>
                     <button type="submit" style="margin-left: 15px;">{{i18n "mist.popupWindows.onboarding.buttons.importAccount"}}</button>
                 </form>
diff --git a/interface/client/templates/popupWindows/onboardingScreen.js b/interface/client/templates/popupWindows/onboardingScreen.js
index f5afd11ad..d99e32829 100644
--- a/interface/client/templates/popupWindows/onboardingScreen.js
+++ b/interface/client/templates/popupWindows/onboardingScreen.js
@@ -11,6 +11,29 @@ The onboardingScreen template
 @constructor
 */
 
+/**
+Check if its the testnet
+
+@method isTestnet
+*/
+var isTestnet = function(template){
+    // CHECK FOR NETWORK
+    web3.eth.getBlock(0, function(e, res){
+        if(!e){
+            switch(res.hash) {
+                case '0x0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303':
+                    TemplateVar.set(template, 'testnet', true);
+                    break;
+                case '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3':
+                    TemplateVar.set(template, 'testnet', false);
+                    break;
+                default:
+                    TemplateVar.set(template, 'testnet', false);
+            }
+        }
+    });
+}
+
 /**
 Update the peercount
 
@@ -74,7 +97,8 @@ Template['popupWindows_onboardingScreen'].onCreated(function(){
 })
 
 Template['popupWindows_onboardingScreen'].onRendered(function(){
-    var template = this;
+    // check which net it is
+    isTestnet(this);
 })
 
 Template['popupWindows_onboardingScreen'].events({
@@ -82,20 +106,26 @@ Template['popupWindows_onboardingScreen'].events({
         if(TemplateVar.get('testnet')) {
             ipc.send('onBoarding_changeNet', false);
             TemplateVar.set('testnet', false);
-            // TODO: start syncing subscription
+            // TODO: re-start syncing subscription
         }
 
         TemplateVar.set('currentActive','start');
     },
    'click .goto-import-account': function(){
         TemplateVar.set('currentActive','import-account');
+
+        // if testnet, make sure to switch to the mainnet
+        if(TemplateVar.get('testnet')) {
+            ipc.send('onBoarding_changeNet', false);
+            TemplateVar.set('testnet', false);
+            // TODO: re-start syncing subscription
+        }
     },
    'click .start-testnet': function(e, template){
 
         ipc.send('onBoarding_changeNet', true);
         TemplateVar.set('testnet', true);
-
-        // TODO: start syncing subscription
+        // TODO: re-start syncing subscription
 
         TemplateVar.set('currentActive','testnet');
         template.$('.onboarding-testnet input.password').focus();
@@ -200,54 +230,45 @@ Template['popupWindows_onboardingScreen_importAccount'].events({
     @event submit form
     */
     'submit form': function(e, template){
-        var pw = template.find('input.password').value,
-            pwRepeat = template.find('input.password-repeat').value;
+        var pw = template.find('input.password').value;
 
-        if(!pw || pw !== pwRepeat) {
-            GlobalNotification.warning({
-                content: TAPi18n.__('mist.popupWindows.requestAccount.errors.passwordMismatch'),
-                duration: 3
-            });
 
-        } else {
+        ipc.send('backendAction_importPresaleFile', TemplateVar.get('filePath'), pw);
 
-            ipc.send('backendAction_importPresaleFile', TemplateVar.get('filePath'), pw);
+        TemplateVar.set('importing', true);
+        ipc.on('uiAction_importedPresaleFile', function(e, address){
+            TemplateVar.set(template, 'importing', false);
+            TemplateVar.set(template, 'filePath', false);
 
-            TemplateVar.set('importing', true);
-            ipc.on('uiAction_importedPresaleFile', function(e, address){
-                TemplateVar.set(template, 'importing', false);
-                TemplateVar.set(template, 'filePath', false);
+            console.log('Imported account: ', address);
+            
+            if(address) {
+                ipc.removeAllListeners('uiAction_importedPresaleFile');
 
-                console.log('Imported account: ', address);
+                // move to add account screen, when in the onboarding window
+                if($('.onboarding-start')[0]) {
+                    TemplateVar.setTo('.onboarding-account', 'newAccount', address);
+                    TemplateVar.setTo('.onboarding-screen', 'currentActive', 'account');
                 
-                if(address) {
-                    ipc.removeAllListeners('uiAction_importedPresaleFile');
-
-                    // move to add account screen, when in the onboarding window
-                    if($('.onboarding-start')[0]) {
-                        TemplateVar.setTo('.onboarding-account', 'newAccount', address);
-                        TemplateVar.setTo('.onboarding-screen', 'currentActive', 'account');
-                    
-                    // otherwise simply close the window
-                    } else {
-                        ipc.send('backendAction_closePopupWindow');
-                    }
+                // otherwise simply close the window
+                } else {
+                    ipc.send('backendAction_closePopupWindow');
+                }
 
 
-                } else {
+            } else {
 
-                    GlobalNotification.warning({
-                        content: TAPi18n.__('mist.popupWindows.onboarding.errors.importFailed'),
-                        duration: 4
-                    });
-                }
-            });
+                GlobalNotification.warning({
+                    content: TAPi18n.__('mist.popupWindows.onboarding.errors.importFailed'),
+                    duration: 4
+                });
+            }
+        });
 
-            // clear form
-            template.find('input.password').value = '';
-            template.find('input.password-repeat').value = '';
-            pw = pwRepeat = null;
-        }
+        // clear form
+        template.find('input.password').value = '';
+        template.find('input.password-repeat').value = '';
+        pw = null;
     }
 });
 
diff --git a/modules/ipcCommunicator.js b/modules/ipcCommunicator.js
index ab682e17f..07a264583 100644
--- a/modules/ipcCommunicator.js
+++ b/modules/ipcCommunicator.js
@@ -96,8 +96,10 @@ ipc.on('backendAction_importPresaleFile', function(e, path, pw) {
 
     // file password
     setTimeout(function(){
-        if(!error)
+        if(!error) {
             nodeProcess.stdin.write(pw +"\r\n");
+            pw = null;
+        }
     }, 10);
 });