diff --git a/static/directives/signup-form.html b/static/directives/signup-form.html
index f5e5f33df..5f299ae09 100644
--- a/static/directives/signup-form.html
+++ b/static/directives/signup-form.html
@@ -1,10 +1,12 @@
 <div class="signup-form-element">
   <form class="form-signup" name="signupForm" ng-submit="register()" ngshow="!awaitingConfirmation && !registering">
-    <input type="text" class="form-control" placeholder="Create a username" name="username" ng-model="newUser.username" autofocus required>
+    <input type="text" class="form-control" placeholder="Create a username" name="username" ng-model="newUser.username" autofocus required ng-pattern="/^[a-z0-9_]{4,30}$/">
     <input type="email" class="form-control" placeholder="Email address" ng-model="newUser.email" required>
-    <input type="password" class="form-control" placeholder="Create a password" ng-model="newUser.password" required>
+    <input type="password" class="form-control" placeholder="Create a password" ng-model="newUser.password" required
+           ng-pattern="/^.{8,}$/">
     <input type="password" class="form-control" placeholder="Verify your password" ng-model="newUser.repeatPassword"
-           match="newUser.password" required>
+           match="newUser.password" required
+           ng-pattern="/^.{8,}$/">
     <div class="form-group signin-buttons">
       <button id="signupButton"
               class="btn btn-primary btn-block landing-signup-button" ng-disabled="signupForm.$invalid" type="submit"
diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html
index 721f8ab58..68473401b 100644
--- a/static/partials/user-admin.html
+++ b/static/partials/user-admin.html
@@ -139,9 +139,10 @@
               <div ng-show="!updatingUser" class="panel-body">
                 <form class="form-change col-md-6" id="changePasswordForm" name="changePasswordForm" ng-submit="changePassword()"
                       ng-show="!awaitingConfirmation && !registering">
-                  <input type="password" class="form-control" placeholder="Your new password" ng-model="cuser.password" required>
+                  <input type="password" class="form-control" placeholder="Your new password" ng-model="cuser.password" required
+                         ng-pattern="/^.{8,}$/">
                   <input type="password" class="form-control" placeholder="Verify your new password" ng-model="cuser.repeatPassword"
-                         match="cuser.password" required>
+                         match="cuser.password" required ng-pattern="/^.{8,}$/">
                   <button class="btn btn-danger" ng-disabled="changePasswordForm.$invalid" type="submit"
                           analytics-on analytics-event="change_pass">Change Password</button>
                 </form>