From 6a5da2745aa19322ed158c21b190af7fbd3e7c71 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 21 Jan 2016 14:59:39 +0100
Subject: [PATCH] Simplify password validation in email edit

---
 webadmin/src/views/account.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index a5be6d994..cf97d5292 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -60,15 +60,15 @@
                                 <small ng-show="emailchange_form.email.$error.required">A valid email address is required</small>
                                 <small ng-show="(emailchange_form.email.$dirty && emailchange_form.email.$invalid) && !emailchange_form.email.$error.required">The Email address is not valid</small>
                             </div>
-                            <input type="email" class="form-control" ng-model="emailchange.email" id="inputEmailChangeEmail" name="email" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="email" class="form-control" ng-model="emailchange.email" id="inputEmailChangeEmail" name="email" required autofocus>
                         </div>
                         <div class="form-group" ng-class="{ 'has-error': (emailchange_form.password.$dirty && emailchange_form.password.$invalid) || (!emailchange_form.password.$dirty && emailchange.error.password) }">
                             <label class="control-label" for="inputEmailChangePassword">Password</label>
                             <div class="control-label" ng-show="(emailchange_form.password.$dirty && emailchange_form.password.$invalid) || (!emailchange_form.password.$dirty && emailchange.error.password)">
-                                <small ng-show=" emailchange_form.password.$dirty && emailchange_form.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
-                                <small ng-show="!emailchange_form.password.$dirty && emailchange.error.password">Invalid pasword</small>
+                                <small ng-show=" emailchange_form.password.$dirty && emailchange_form.password.$invalid">Password required</small>
+                                <small ng-show="!emailchange_form.password.$dirty && emailchange.error.password">Wrong password</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="emailchange.password" id="inputEmailChangePassword" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required autofocus>
+                            <input type="password" class="form-control" ng-model="emailchange.password" id="inputEmailChangePassword" name="password" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="emailchange_form.$invalid"/>
                     </fieldset>