diff --git a/src/popup/app/accounts/accountsHintController.js b/src/popup/app/accounts/accountsHintController.js
index a5f8a3dc73b..e9d0aa78f4c 100644
--- a/src/popup/app/accounts/accountsHintController.js
+++ b/src/popup/app/accounts/accountsHintController.js
@@ -8,7 +8,11 @@
         $scope.submitPromise = null;
         $scope.submit = function (model) {
             if (!model.email) {
-                toastr.error('Email is required.');
+                toastr.error('Email address is required.', 'Errors have occurred');
+                return;
+            }
+            if (model.email.indexOf('@') === -1) {
+                toastr.error('Invalid email address.', 'Errors have occurred');
                 return;
             }
 
diff --git a/src/popup/app/accounts/accountsLoginController.js b/src/popup/app/accounts/accountsLoginController.js
index f1fb714caf8..84b8f9a0a92 100644
--- a/src/popup/app/accounts/accountsLoginController.js
+++ b/src/popup/app/accounts/accountsLoginController.js
@@ -1,7 +1,7 @@
 angular
     .module('bit.accounts')
 
-    .controller('accountsLoginController', function ($scope, $state, $stateParams, loginService, userService) {
+    .controller('accountsLoginController', function ($scope, $state, $stateParams, loginService, userService, toastr) {
         popupUtils.initListSectionItemListeners();
 
         if ($stateParams.email) {
@@ -18,11 +18,15 @@
         $scope.loginPromise = null;
         $scope.login = function (model) {
             if (!model.email) {
-                toastr.error('Email is required.');
+                toastr.error('Email address is required.', 'Errors have occurred');
+                return;
+            }
+            if (model.email.indexOf('@') === -1) {
+                toastr.error('Invalid email address.', 'Errors have occurred');
                 return;
             }
             if (!model.masterPassword) {
-                toastr.error('Master password is required.');
+                toastr.error('Master password is required.', 'Errors have occurred');
                 return;
             }
 
diff --git a/src/popup/app/accounts/accountsLoginTwoFactorController.js b/src/popup/app/accounts/accountsLoginTwoFactorController.js
index a19538bb421..f363fe0df72 100644
--- a/src/popup/app/accounts/accountsLoginTwoFactorController.js
+++ b/src/popup/app/accounts/accountsLoginTwoFactorController.js
@@ -1,14 +1,14 @@
 angular
     .module('bit.accounts')
 
-    .controller('accountsLoginTwoFactorController', function ($scope, $state, loginService) {
+    .controller('accountsLoginTwoFactorController', function ($scope, $state, loginService, toastr) {
         popupUtils.initListSectionItemListeners();
         $('#code').focus();
 
         $scope.loginPromise = null;
         $scope.login = function (model) {
             if (!model.code) {
-                toastr.error('Verification code is required.');
+                toastr.error('Verification code is required.', 'Errors have occurred');
                 return;
             }
 
diff --git a/src/popup/app/accounts/accountsRegisterController.js b/src/popup/app/accounts/accountsRegisterController.js
index 755e5944e8a..7dcb8079b94 100644
--- a/src/popup/app/accounts/accountsRegisterController.js
+++ b/src/popup/app/accounts/accountsRegisterController.js
@@ -8,15 +8,19 @@
         $scope.submitPromise = null;
         $scope.submit = function (model) {
             if (!model.email) {
-                toastr.error('Email is required.');
+                toastr.error('Email address is required.', 'Errors have occurred');
+                return;
+            }
+            if (model.email.indexOf('@') === -1) {
+                toastr.error('Invalid email address.', 'Errors have occurred');
                 return;
             }
             if (!model.masterPassword) {
-                toastr.error('Master password is required.');
+                toastr.error('Master password is required.', 'Errors have occurred');
                 return;
             }
             if (model.masterPassword !== model.masterPasswordRetype) {
-                toastr.error('Master password confirmation does not match.');
+                toastr.error('Master password confirmation does not match.', 'Errors have occurred');
                 return;
             }
 
diff --git a/src/popup/app/accounts/views/accountsHint.html b/src/popup/app/accounts/views/accountsHint.html
index 403ae894770..a9a685326c0 100644
--- a/src/popup/app/accounts/views/accountsHint.html
+++ b/src/popup/app/accounts/views/accountsHint.html
@@ -16,7 +16,7 @@
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-envelope fa-lg fa-fw"></i>
                         <label for="email" class="sr-only">Email Address</label>
-                        <input id="email" type="email" name="Email" placeholder="Email Address" ng-model="model.email">
+                        <input id="email" type="text" name="Email" placeholder="Email Address" ng-model="model.email">
                     </div>
                 </div>
                 <div class="list-section-footer">
diff --git a/src/popup/app/accounts/views/accountsLogin.html b/src/popup/app/accounts/views/accountsLogin.html
index 8828bfcf831..b9be00fbf76 100644
--- a/src/popup/app/accounts/views/accountsLogin.html
+++ b/src/popup/app/accounts/views/accountsLogin.html
@@ -16,7 +16,7 @@
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-envelope fa-lg fa-fw"></i>
                         <label for="email" class="sr-only">Email Address</label>
-                        <input id="email" type="email" name="Email" placeholder="Email Address" ng-model="model.email">
+                        <input id="email" type="text" name="Email" placeholder="Email Address" ng-model="model.email">
                     </div>
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-lock fa-lg fa-fw"></i>
diff --git a/src/popup/app/accounts/views/accountsRegister.html b/src/popup/app/accounts/views/accountsRegister.html
index 7bc6aa535d9..9f9ce7e404e 100644
--- a/src/popup/app/accounts/views/accountsRegister.html
+++ b/src/popup/app/accounts/views/accountsRegister.html
@@ -16,7 +16,7 @@
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-envelope fa-lg fa-fw"></i>
                         <label for="email" class="sr-only">Email Address</label>
-                        <input id="email" type="email" name="Email" placeholder="Email Address" ng-model="model.email">
+                        <input id="email" type="text" name="Email" placeholder="Email Address" ng-model="model.email">
                     </div>
                     <div class="list-section-item list-section-item-icon-input">
                         <i class="fa fa-lock fa-lg fa-fw"></i>
diff --git a/src/popup/app/settings/settingsAddFolderController.js b/src/popup/app/settings/settingsAddFolderController.js
index 058e3de1ef4..b644034f584 100644
--- a/src/popup/app/settings/settingsAddFolderController.js
+++ b/src/popup/app/settings/settingsAddFolderController.js
@@ -8,7 +8,7 @@ angular
         $scope.savePromise = null;
         $scope.save = function (model) {
             if (!model.name) {
-                toastr.error('Name is required.');
+                toastr.error('Name is required.', 'Errors have occurred');
                 return;
             }
 
diff --git a/src/popup/app/settings/settingsEditFolderController.js b/src/popup/app/settings/settingsEditFolderController.js
index 9057f32d2d7..cf0787f4695 100644
--- a/src/popup/app/settings/settingsEditFolderController.js
+++ b/src/popup/app/settings/settingsEditFolderController.js
@@ -15,7 +15,7 @@
         $scope.savePromise = null;
         $scope.save = function (model) {
             if (!model.name) {
-                toastr.error('Name is required.');
+                toastr.error('Name is required.', 'Errors have occurred');
                 return;
             }
 
diff --git a/src/popup/app/vault/vaultAddSiteController.js b/src/popup/app/vault/vaultAddSiteController.js
index b1066b7b77f..647ad25693d 100644
--- a/src/popup/app/vault/vaultAddSiteController.js
+++ b/src/popup/app/vault/vaultAddSiteController.js
@@ -32,11 +32,11 @@
         $scope.savePromise = null;
         $scope.save = function (model) {
             if (!model.name) {
-                toastr.error('Name is required.');
+                toastr.error('Name is required.', 'Errors have occurred');
                 return;
             }
             if (!model.password) {
-                toastr.error('Password is required.');
+                toastr.error('Password is required.', 'Errors have occurred');
                 return;
             }
 
diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js
index 90bf37982e0..0309a86044b 100644
--- a/src/popup/app/vault/vaultEditSiteController.js
+++ b/src/popup/app/vault/vaultEditSiteController.js
@@ -32,11 +32,11 @@ angular
         $scope.savePromise = null;
         $scope.save = function (model) {
             if (!model.name) {
-                toastr.error('Name is required.');
+                toastr.error('Name is required.', 'Errors have occurred');
                 return;
             }
             if (!model.password) {
-                toastr.error('Password is required.');
+                toastr.error('Password is required.', 'Errors have occurred');
                 return;
             }