diff --git a/controller/translationcontroller.php b/controller/translationcontroller.php
index 30138949..1bf3e06c 100644
--- a/controller/translationcontroller.php
+++ b/controller/translationcontroller.php
@@ -313,6 +313,7 @@ class TranslationController extends ApiController {
 			'last.access' => $this->trans->t('Last accessed'),
 			'never' => $this->trans->t('Never'),
 			'no.vaults' => $this->trans->t('No vaults found, why not create one?'),
+			'min.vault.key.strength' => $this->trans->t('Password strength must be atleast: {{strength}}'),
 
 			'new.vault.name' => $this->trans->t('Please give your new vault a name.'),
 			'new.vault.pass' => $this->trans->t('Vault password'),
diff --git a/js/templates.js b/js/templates.js
index 7d531fa5..8ee4c99c 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -119,5 +119,5 @@ angular.module('views/show_vault.html', []).run(['$templateCache', function($tem
 angular.module('views/vaults.html', []).run(['$templateCache', function($templateCache) {
   'use strict';
   $templateCache.put('views/vaults.html',
-    '<div class="vault_wrapper"><div class="vaults" ng-if="!list_selected_vault && !creating_vault"><div class="ui-select-container ui-select-bootstrap vaultlist"><ul><li ng-click="newVault()">+ Create a new vault</li><li ng-repeat="vault in vaults" ng-class="{\'selected\': vault == list_selected_vault }" ng-click="selectVault(vault)"><div><span class="ui-select-choices-row-inner"><div class="ng-binding ng-scope">{{vault.name}}</div><small class="ng-binding ng-scope">{{ \'created\' | translate}}: {{vault.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}} | {{ \'last.access\' | translate}}: <span ng-if="vault.last_access > 0">{{vault.last_access * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</span> <span ng-if="vault.last_access === 0">{{\'never\' | translate}}</span></small></span></div></li><li ng-if="vaults.length === 0">{{ \'no.vaults\' | translate}}</li></ul></div></div><div ng-if="creating_vault"><div class="login_form" ng-init="vault_name = \'\' ">{{\'new.vault.name\' | translate}}<div><input type="text" ng-model="vault_name" required></div><div>{{ \'new.vault.pass\' | translate}} <input type="password" ng-model="vault_key" required><ng-password-meter password="vault_key"></ng-password-meter></div><div>{{ \'new.vault.passr\' | translate}} <input type="password" ng-model="vault_key2" required></div><div ng-show="error" class="error"><ul><li>{{error}}</li></ul></div><div><small>{{\'new.vault.sharing_key_notice\' | translate}}</small></div><div class="button_wrapper"><div class="button button-geen" ng-if="!creating_keys" ng-click="createVault(vault_name, vault_key, vault_key2)"><span>{{ \'new.vault.create\' | translate }}</span></div><div class="button" ng-if="creating_keys"><span><i class="fa fa-spinner fa-spin"></i> {{creating_keys}}</span></div><div class="button button-red" ng-click="clearState()">{{ \'cancel\' | translate}}</div><div class="hidden">{{sharing_keys}}</div></div></div></div><div ng-if="list_selected_vault != false"><div class="vaultlist"><ul><li ng-click="clearState()">{{ \'go.back.vaults\' | translate }}</li></ul></div><div class="login_form"><div ng-show="error" class="error"><ul><li>{{error}}</li></ul></div>{{ \'input.vault.password\' | translate}} {{list_selected_vault.name}}<div class="pw-input"><input type="password" ng-model="vault_key" ng-enter="loginToVault(list_selected_vault, vault_key)"> <small class="last_access">{{\'last.access\' | translate}}: <span ng-if="list_selected_vault.last_access > 0">{{list_selected_vault.last_access * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</span> <span ng-if="list_selected_vault.last_access === 0">Never</span></small></div><div><div><label><input type="checkbox" ng-checked="default_vault" ng-click="toggleDefaultVault()"> {{ \'vault.default\' | translate}}</label></div><div><label><input type="checkbox" ng-checked="remember_vault_password" ng-click="toggleRememberPassword()"> {{ \'vault.auto.login\' | translate}}</label></div></div><div class="button button-geen" ng-click="loginToVault(list_selected_vault, vault_key)">{{ \'vault.decrypt\' | translate}}</div></div></div></div>');
+    '<div class="vault_wrapper"><div class="vaults" ng-if="!list_selected_vault && !creating_vault"><div class="ui-select-container ui-select-bootstrap vaultlist"><ul><li ng-click="newVault()">+ Create a new vault</li><li ng-repeat="vault in vaults" ng-class="{\'selected\': vault == list_selected_vault }" ng-click="selectVault(vault)"><div><span class="ui-select-choices-row-inner"><div class="ng-binding ng-scope">{{vault.name}}</div><small class="ng-binding ng-scope">{{ \'created\' | translate}}: {{vault.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}} | {{ \'last.access\' | translate}}: <span ng-if="vault.last_access > 0">{{vault.last_access * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</span> <span ng-if="vault.last_access === 0">{{\'never\' | translate}}</span></small></span></div></li><li ng-if="vaults.length === 0">{{ \'no.vaults\' | translate}}</li></ul></div></div><div ng-if="creating_vault"><div class="login_form" ng-init="vault_name = \'\'; vault_key=\'\'; ">{{\'new.vault.name\' | translate}}<div><input type="text" ng-model="vault_name" required></div><div>{{ \'new.vault.pass\' | translate}} <input type="password" ng-model="vault_key" required><ng-password-meter password="vault_key" score="vault_key_score"></ng-password-meter></div><div>{{ \'new.vault.passr\' | translate}} <input type="password" ng-model="vault_key2" required></div><div ng-show="error || vault_key_score.score < 2" class="error"><ul><li ng-show="error">{{error}}</li><li ng-show="vault_key_score.score < 2">{{\'min.vault.key.strength\' | translate:\'{strength:"weak"}\'}}</li></ul></div><div><small>{{\'new.vault.sharing_key_notice\' | translate}}</small></div><div class="button_wrapper"><button class="button button-geen" ng-if="!creating_keys" ng-click="createVault(vault_name, vault_key, vault_key2)" ng-disabled="vault_key_score.score < 2 || vault_key !== vault_key2 || vault_key === \'\'">{{ \'new.vault.create\' | translate }}</button><div class="button" ng-if="creating_keys"><span><i class="fa fa-spinner fa-spin"></i> {{creating_keys}}</span></div><div class="button button-red" ng-click="clearState()">{{ \'cancel\' | translate}}</div><div class="hidden">{{sharing_keys}}</div></div></div></div><div ng-if="list_selected_vault != false"><div class="vaultlist"><ul><li ng-click="clearState()">{{ \'go.back.vaults\' | translate }}</li></ul></div><div class="login_form"><div ng-show="error" class="error"><ul><li>{{error}}</li></ul></div>{{ \'input.vault.password\' | translate}} {{list_selected_vault.name}}<div class="pw-input"><input type="password" ng-model="vault_key" ng-enter="loginToVault(list_selected_vault, vault_key)"> <small class="last_access">{{\'last.access\' | translate}}: <span ng-if="list_selected_vault.last_access > 0">{{list_selected_vault.last_access * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</span> <span ng-if="list_selected_vault.last_access === 0">Never</span></small></div><div><div><label><input type="checkbox" ng-checked="default_vault" ng-click="toggleDefaultVault()"> {{ \'vault.default\' | translate}}</label></div><div><label><input type="checkbox" ng-checked="remember_vault_password" ng-click="toggleRememberPassword()"> {{ \'vault.auto.login\' | translate}}</label></div></div><div class="button button-geen" ng-click="loginToVault(list_selected_vault, vault_key)">{{ \'vault.decrypt\' | translate}}</div></div></div></div>');
 }]);
diff --git a/templates/views/vaults.html b/templates/views/vaults.html
index 96f9bc39..d50aafdb 100644
--- a/templates/views/vaults.html
+++ b/templates/views/vaults.html
@@ -29,7 +29,7 @@
 	</div>
 
 	<div ng-if="creating_vault">
-		<div class="login_form" ng-init="vault_name = '' ">
+		<div class="login_form" ng-init="vault_name = ''; vault_key=''; ">
 			{{'new.vault.name' | translate}}
 			<div>
 				<input type="text" ng-model="vault_name" required>
@@ -37,15 +37,16 @@
 			<div>
 				{{ 'new.vault.pass' | translate}}
 				<input type="password" ng-model="vault_key" required>
-				<ng-password-meter password="vault_key"></ng-password-meter>
+				<ng-password-meter password="vault_key" score="vault_key_score"></ng-password-meter>
 			</div>
 			<div>
 				{{ 'new.vault.passr' | translate}}
 				<input type="password" ng-model="vault_key2" required>
 			</div>
-			<div ng-show="error" class="error">
+			<div ng-show="error || vault_key_score.score < 2" class="error">
 				<ul>
-					<li>{{error}}</li>
+					<li ng-show="error">{{error}}</li>
+					<li ng-show="vault_key_score.score < 2">{{'min.vault.key.strength' | translate:'{strength:"weak"}'}}</li>
 				</ul>
 			</div>
 			<div>
@@ -53,11 +54,10 @@
 				</small>
 			</div>
 			<div class="button_wrapper">
-				<div class="button button-geen" ng-if="!creating_keys"
-					 ng-click="createVault(vault_name, vault_key, vault_key2)">
-					<span>{{ 'new.vault.create' | translate }}</span>
-
-				</div>
+				<button class="button button-geen" ng-if="!creating_keys"
+					 ng-click="createVault(vault_name, vault_key, vault_key2)" ng-disabled="vault_key_score.score < 2 || vault_key !== vault_key2 || vault_key === ''">
+					{{ 'new.vault.create' | translate }}
+				</button>
 				<div class="button" ng-if="creating_keys">
 					<span>
 						<i class="fa fa-spinner fa-spin"></i>