diff --git a/Deploy/db/registry.sql b/Deploy/db/registry.sql
index 66bb219e6..e5f13f7d4 100644
--- a/Deploy/db/registry.sql
+++ b/Deploy/db/registry.sql
@@ -143,7 +143,8 @@ create table replication_job (
  tags   varchar(16384),
  creation_time timestamp default CURRENT_TIMESTAMP,
  update_time timestamp default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
- PRIMARY KEY (id)
+ PRIMARY KEY (id),
+ INDEX policy (policy_id)
  );
  
 create table properties (
@@ -152,11 +153,8 @@ create table properties (
  primary key (k)
  );
 
-insert into properties (k, v) values 
-('schema_version', '0.1.1');
-
 CREATE TABLE IF NOT EXISTS `alembic_version` (
     `version_num` varchar(32) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-insert into alembic_version values ('0.2.0');
+insert into alembic_version values ('0.3.0');
diff --git a/migration/db_meta.py b/migration/db_meta.py
index fecb2aed3..af8f444b0 100644
--- a/migration/db_meta.py
+++ b/migration/db_meta.py
@@ -124,3 +124,4 @@ class ReplicationJob(Base):
     creation_time = sa.Column(mysql.TIMESTAMP, server_default = sa.text("CURRENT_TIMESTAMP"))
     update_time = sa.Column(mysql.TIMESTAMP, server_default = sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"))
     
+    __table_args__ = (sa.Index('policy', "policy_id"),)
diff --git a/migration/migration_harbor/versions/0_2_0.py b/migration/migration_harbor/versions/0_3_0.py
similarity index 97%
rename from migration/migration_harbor/versions/0_2_0.py
rename to migration/migration_harbor/versions/0_3_0.py
index 77a31ef34..b0164e829 100644
--- a/migration/migration_harbor/versions/0_2_0.py
+++ b/migration/migration_harbor/versions/0_3_0.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""0.1.1 to 0.2.0
+"""0.1.1 to 0.3.0
 
 Revision ID: 0.1.1
 Revises: 
@@ -20,7 +20,7 @@ Revises:
 """
 
 # revision identifiers, used by Alembic.
-revision = '0.2.0'
+revision = '0.3.0'
 down_revision = '0.1.1'
 branch_labels = None
 depends_on = None
diff --git a/views/change-password.htm b/views/change-password.htm
index 62267f08d..7753347e5 100644
--- a/views/change-password.htm
+++ b/views/change-password.htm
@@ -11,7 +11,7 @@
                 <label for="oldPassword" class="col-sm-3 control-label">// 'old_password' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="password" class="form-control" id="oldPassword" ng-model="user.oldPassword" ng-change="vm.reset()" name="uOldPassword" required>
-                  <div class="error-message" ng-messages="form.uOldPassword.$touched && form.uOldPassword.$error">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uOldPassword.$touched) && form.uOldPassword.$error">
                     <span ng-message="required">// 'old_password_is_required' | tr //</span>
                   </div> 
                 </div>
@@ -23,7 +23,7 @@
                 <label for="password" class="col-sm-3 control-label">// 'new_password' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="password" class="form-control" id="password" ng-model="user.password" ng-change="vm.reset()" name="uPassword" required password>
-                  <div class="error-message" ng-messages="form.uPassword.$touched && form.uPassword.$error">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uPassword.$touched) && form.uPassword.$error">
                     <span ng-message="required">// 'password_is_required' | tr //</span>
                     <span ng-message="password">// 'password_is_invalid' | tr //</span>
                   </div>
@@ -37,7 +37,7 @@
                 <label for="confirmPassword" class="col-sm-3 control-label">// 'confirm_password' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" ng-change="vm.reset()" name="uConfirmPassword" ng-model-options="{ updateOn: 'blur' }" compare-to="user.password">
-                  <div class="error-message" ng-messages="form.uConfirmPassword.$touched && form.uConfirmPassword.$error">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uConfirmPassword.$touched) && form.uConfirmPassword.$error">
                     <span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
                   </div>
                 </div>
@@ -60,4 +60,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/forgot-password.htm b/views/forgot-password.htm
index 68d119906..3521471c2 100644
--- a/views/forgot-password.htm
+++ b/views/forgot-password.htm
@@ -11,19 +11,19 @@
                 <label for="email" class="col-sm-3 control-label">// 'email' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="email" class="form-control" id="email" ng-model="user.email" ng-model-options="{ debounce: 500 }" ng-change="vm.reset()" name="uEmail" required data-target="email">
+                  <div class="error-message">
+                    <div ng-messages="(form.$submitted || form.uEmail.$touched) && form.uEmail.$error">
+                      <span ng-message="required">// 'email_is_required' | tr //</span>
+                      <span ng-message="email">// 'email_content_illegal' | tr //</span>
+                    </div>
+                    <span ng-show="vm.hasError">// vm.errorMessage | tr //</span>
+                  </div>
                   <p class="help-block small-size-fonts">// 'forgot_password_description' | tr //</p>
                 </div>
                 <div class="col-sm-2">
                   <span class="asterisk">*</span>
                 </div>
               </div>
-              <div class="error-message">
-                <div ng-messages="form.$submitted && form.uEmail.$error">
-                  <span ng-message="required">// 'email_is_required' | tr //</span>
-                   <span ng-message="email">// 'email_content_illegal' | tr //</span>
-                </div>
-                <span ng-show="vm.hasError">// vm.errorMessage | tr //</span>
-              </div>
               <div class="form-group">
                 <div class="col-md-offset-8 col-md-10">
                   <button type="submit" class="btn btn-success" ng-click="form.$valid && vm.sendMail(user)"  loading-progress hide-target="false" toggle-in-progress="vm.toggleInProgress">// 'send' | tr //</button>   
diff --git a/views/reset-password.htm b/views/reset-password.htm
index d4fdf3c53..be9793eae 100644
--- a/views/reset-password.htm
+++ b/views/reset-password.htm
@@ -11,7 +11,7 @@
                 <label for="password" class="col-sm-3 control-label">// 'password' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="password" class="form-control" id="password" ng-model="user.password" ng-change="vm.reset()" name="uPassword" ng-model-options="{ debounce: 250 }" required password>
-                  <div class="error-message" ng-messages="form.uPassword.$dirty && form.uPassword.$error">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uPassword.$touched) && form.uPassword.$error">
                     <span ng-message="required">// 'password_is_required' | tr //</span>
                     <span ng-message="password">// 'password_is_invalid' | tr //</span>
                   </div>
@@ -25,7 +25,7 @@
                 <label for="confirmPassword" class="col-sm-3 control-label">// 'confirm_password' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" ng-change="vm.reset()" name="uConfirmPassword" ng-model-options="{ debounce: 250 }" compare-to="user.password">
-                  <div class="error-message" ng-messages="form.uConfirmPassword.$dirty && form.uConfirmPassword.$error">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uConfirmPassword.$touched) && form.uConfirmPassword.$error">
                     <span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
                   </div>
                 </div>
@@ -35,8 +35,8 @@
               </div>
               <div class="form-group">
                 <div class="col-md-offset-7 col-md-10">
-                  <input type="submit" class="btn btn-primary" ng-disabled="form.$invalid" ng-click="vm.resetPassword(user)" value="// 'save' | tr //">                    
-                  <input type="submit" class="btn btn-default" ng-click="vm.cancel()" value="// 'cancel' | tr //">
+                  <button type="submit" class="btn btn-primary" ng-click="form.$valid && vm.resetPassword(user)">// 'save' | tr //</button>                    
+                  <button type="submit" class="btn btn-default" ng-click="vm.cancel()">// 'cancel' | tr //</button>
                 </div>
               </div>  
               <div class="error-message">
diff --git a/views/sign-up.htm b/views/sign-up.htm
index 6ea2b2813..b9b21f6fc 100644
--- a/views/sign-up.htm
+++ b/views/sign-up.htm
@@ -12,12 +12,12 @@
         </h1>
         <div class="row">
           <div class="col-md-12 col-md-offset-2 main-content">
-            <form name="form" class="form-horizontal css-form" ng-submit="form.$valid">              
+            <form name="form" class="form-horizontal css-form" novalidate>              
               <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">// 'username' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="text" class="form-control" id="username" ng-model="user.username" name="uUsername" ng-model-options="{ updateOn: 'blur' }" required maxlength="20" invalid-chars user-exists data-target="username">                 
-                  <div class="error-message" ng-messages="form.uUsername.$error" ng-if="form.uUsername.$touched">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uUsername.$touched) && form.uUsername.$error" >
                     <span ng-message="required">// 'username_is_required' | tr //</span>
                     <span ng-message="maxlength">// 'username_is_too_long' | tr //</span>
                     <span ng-message="invalidChars">// 'username_contains_illegal_chars' | tr //</span>
@@ -32,7 +32,7 @@
                 <label for="email" class="col-sm-3 control-label">// 'email' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="email" class="form-control" id="email" ng-model="user.email" name="uEmail" ng-model-options="{ updateOn: 'blur' }" required user-exists data-target="email" maxlength="50">
-                  <div class="error-message" ng-messages="form.uEmail.$error" ng-if="form.uEmail.$touched">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uEmail.$touched) &&form.uEmail.$error">
                     <span ng-message="required">// 'email_is_required' | tr //</span>
                     <span ng-message="email">// 'email_content_illegal' | tr //</span>
                     <span ng-message="userExists">// 'email_has_been_taken' | tr //</span>
@@ -48,7 +48,7 @@
                 <label for="fullName" class="col-sm-3 control-label">// 'full_name' | tr //:</label>
                 <div class="col-sm-7"> 
                   <input type="text" class="form-control" id="fullName" ng-model="user.fullName" name="uFullName" ng-model-options="{ updateOn: 'blur' }" required maxlength="20" invalid-chars>
-                  <div class="error-message" ng-messages="form.uFullName.$error" ng-if="form.uFullName.$touched">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uFullName.$touched) && form.uFullName.$error">
                     <span ng-message="required">// 'full_name_is_required' | tr //</span>
                     <span ng-message="invalidChars">// 'full_name_contains_illegal_chars' | tr //</span>
                     <span ng-message="maxlength">// 'full_name_is_too_long' | tr //</span>
@@ -63,7 +63,7 @@
                 <label for="password" class="col-sm-3 control-label">// 'password' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="password" class="form-control" id="password" ng-model="user.password" name="uPassword" ng-model-options="{ updateOn: 'blur' }" required password>
-                  <div class="error-message" ng-messages="form.uPassword.$error" ng-if="form.uPassword.$touched">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uPassword.$touched) && form.uPassword.$error">
                     <span ng-message="required">// 'password_is_required' | tr //</span>
                     <span ng-message="password">// 'password_is_invalid' | tr //</span>
                   </div>
@@ -77,7 +77,7 @@
                 <label for="confirmPassword" class="col-sm-3 control-label">// 'confirm_password' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" name="uConfirmPassword" ng-model-options="{ updateOn: 'blur' }" compare-to="user.password">
-                  <div class="error-message" ng-messages="form.uConfirmPassword.$error" ng-if="form.uConfirmPassword.$touched">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uConfirmPassword.$touched) && form.uConfirmPassword.$error">
                     <span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
                   </div>
                 </div>
@@ -89,7 +89,7 @@
                 <label for="comments" class="col-sm-3 control-label">// 'comments' | tr //:</label>
                 <div class="col-sm-7">
                   <input type="text" class="form-control" id="comments" ng-model="user.comment" name="uComments" ng-model-options="{ updateOn: 'blur' }" maxlength="20">
-                  <div class="error-message" ng-messages="form.uComments.$error" ng-if="form.uComments.$touched">
+                  <div class="error-message" ng-messages="(form.$submitted || form.uComments.$touched) && form.uComments.$error">
                     <span ng-show="maxlength">// 'comment_is_too_long' | tr //</span>
                   </div>
                 </div>
@@ -97,9 +97,9 @@
               <div class="form-group">
                 <div class="col-md-offset-8 col-md-10">
                   {{ if eq .AddNew true }}
-                    <input type="submit" class="btn btn-success" ng-disabled="form.$invalid" ng-click="vm.signUp(user)" value="// 'add_new' | tr //">                    
+                    <button type="submit" class="btn btn-success" ng-click="form.$valid && vm.signUp(user)">// 'add_new' | tr //</button>                    
                   {{ else }}
-                    <input type="submit" class="btn btn-success" ng-disabled="form.$invalid" ng-click="vm.signUp(user)" value="// 'sign_up' | tr //">                    
+                    <button type="submit" class="btn btn-success" ng-click="form.$valid && vm.signUp(user)">// 'sign_up' | tr //</button>                 
                   {{ end }}
                 </div>
               </div>