diff --git a/src/app/pages/signin/signin.html b/src/app/pages/signin/signin.html
index 1ab113e..30258db 100644
--- a/src/app/pages/signin/signin.html
+++ b/src/app/pages/signin/signin.html
@@ -30,10 +30,7 @@
                 <ion-label position="floating">Email</ion-label>
                 <ion-input type="text" [(ngModel)]="email"></ion-input>
             </ion-item>
-            <ion-item>
-                <ion-label position="floating">Name or Nickname</ion-label>
-                <ion-input type="text" [(ngModel)]="username"></ion-input>
-            </ion-item>
+            
             <ion-item>
                 <ion-label position="floating">Password</ion-label>
                 <ion-input type="password" [(ngModel)]="password"></ion-input>
@@ -55,14 +52,17 @@
                 <ion-label position="floating">Email</ion-label>
                 <ion-input type="text" [(ngModel)]="email"></ion-input>
             </ion-item>
-
+            <ion-item>
+                <ion-label position="floating">Display Name or Nickname</ion-label>
+                <ion-input type="text" [(ngModel)]="username"></ion-input>
+            </ion-item>
             <ion-item>
                 <ion-label position="floating">Password</ion-label>
                 <ion-input type="password" [(ngModel)]="password"></ion-input>
             </ion-item>
             <ion-item>
                 <ion-label position="floating">Confirm Password</ion-label>
-                <ion-input type="password" [(ngModel)]="password"></ion-input>
+                <ion-input type="password" [(ngModel)]="confirmpassword"></ion-input>
             </ion-item>
 
         </ion-list>
diff --git a/src/app/pages/signin/signin.ts b/src/app/pages/signin/signin.ts
index 47300d8..b5eaa46 100644
--- a/src/app/pages/signin/signin.ts
+++ b/src/app/pages/signin/signin.ts
@@ -13,9 +13,11 @@ import { AlertController, LoadingController, ModalController } from '@ionic/angu
 export class SignInPage {
     email: string;
     password: string;
+
     username: string;
+    confirmpassword: string;
 
-    mode: string = 'register';
+    mode: string = 'signin';
 
     constructor(
         public appManager: AppManager,
@@ -40,8 +42,18 @@ export class SignInPage {
     }
 
     async performRegister() {
+
+        if (this.password != this.confirmpassword) {   
+            alert("Your password and the confirmed password do not match, please try again.");
+            return;
+        }
+        if (this.password.length < 6) {
+            alert("Your password should be at least 6 characters.");
+            return;
+        }
+
         const loading = await this.loadingController.create({
-            message: 'Signing In..'
+            message: 'Registering ..'
         });
         await loading.present();