diff --git a/src/app/auth/login/login.module.ts b/src/app/auth/login/login.module.ts
index 5eda226d52c5738594ffefeaa65cffb31ad12c7d..08e3288ad27cd79b611f3fd510c7bea145a30446 100644
--- a/src/app/auth/login/login.module.ts
+++ b/src/app/auth/login/login.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { IonicModule } from '@ionic/angular';
 
@@ -13,6 +13,7 @@ import { LoginPage } from './login.page';
     CommonModule,
     FormsModule,
     IonicModule,
+    ReactiveFormsModule,
     LoginPageRoutingModule
   ],
   declarations: [LoginPage]
diff --git a/src/app/auth/login/login.page.html b/src/app/auth/login/login.page.html
index 5562a831129cd506a6a8b61a439d8683370414dd..aacc2eb372abe3ea4896681051d0eb53ecfb15b9 100644
--- a/src/app/auth/login/login.page.html
+++ b/src/app/auth/login/login.page.html
@@ -1,10 +1,72 @@
 <ion-header>
+    <ion-toolbar>
+      <ion-title>Awado</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  
+  <ion-content>
+          
+            <form [formGroup]="angForm" novalidate>
+                <ion-grid>
+                    <ion-row justify-content-center>
+                      <ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
+                <div padding>
+                    <img src="../../../assets/images/bike2gologo.png">
+                  </div>
+                  <div class="ion-text">
+                      <h3>Login</h3>
+                     
+                    </div>
+                    
+              <ion-item ><ion-input type="text" formControlName="username" placeholder="Enter First Name"></ion-input></ion-item>
+                <div
+                  *ngIf="angForm.controls['username'].invalid && (angForm.controls['username'].dirty || angForm.controls['username'].touched)"
+                  class="alert-danger">
+                  <div *ngIf="angForm.controls['username'].errors.required">
+                    First Name is required.
+                  </div>
+                </div>
+                
+               
+  
+                <ion-item ><ion-input type="password" formControlName="password" placeholder="Password"></ion-input></ion-item>
+                
+                <div
+                  *ngIf="angForm.controls['password'].invalid && (angForm.controls['password'].dirty || angForm.controls['password'].touched)"
+                  class="alert-danger">
+                  <div *ngIf="angForm.controls['password'].errors.required">
+                    Password is required.
+                  </div>
+                </div>
+                
+            
+            <div id="correctCredentialsmsg" padding *ngIf="correctCredentials">
+              Wrong Credentials !
+            </div>
+  
+            <div padding>
+                <ion-button [disabled]="angForm.pristine || angForm.invalid" size="large" expand="block" (click)="login()">Login</ion-button>
+              </div>
+              <div padding>
+                <ion-button size="large" expand="block" (click)="register()">Click here to Register</ion-button>
+              </div>
+          </ion-col>
+        </ion-row>
+      </ion-grid>
+    </form>
+  </ion-content>
+
+
+
+
+<!-- <ion-header>
   <ion-toolbar>
     <ion-title>Awado</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content>
+    <form [formGroup]="angForm" novalidate>
   <ion-grid>
     <ion-row justify-content-center>
       <ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
@@ -15,15 +77,27 @@
             <h3>Login</h3>
            
           </div>
-        <div padding>
-          <ion-item>
-            <ion-input type="text" [(ngModel)]="username" placeholder="Username"></ion-input>
-          </ion-item>
-
-          <ion-item>
-            <ion-input type="password" [(ngModel)]="password" placeholder="Password"></ion-input>
-          </ion-item>
+         
+          
+    <ion-item ><ion-input type="text" formControlName="username" placeholder="Enter First Name"></ion-input></ion-item>
+      <div
+        *ngIf="angForm.controls['username'].invalid && (angForm.controls['username'].dirty || angForm.controls['username'].touched)"
+        class="alert-danger">
+        <div *ngIf="angForm.controls['username'].errors.required">
+          First Name is required.
+        </div>
+      </div>
+      <ion-item >
+          <ion-input type="text" formControlName="password" placeholder="Enter Last Name"></ion-input>
+      </ion-item>
+      
+      <div
+        *ngIf="angForm.controls['password'].invalid && (angForm.controls['password'].dirty || angForm.controls['password'].touched)"
+        class="alert-danger">
+        <div *ngIf="angForm.controls['password'].errors.required">
+          Last Name is required.
         </div>
+      </div>
 
         <div id="correctCredentialsmsg" padding *ngIf="correctCredentials"> 
           Wrong Credentials !
@@ -38,4 +112,5 @@
       </ion-col>
     </ion-row>
   </ion-grid>
-</ion-content>
\ No newline at end of file
+</form>
+</ion-content> -->
\ No newline at end of file
diff --git a/src/app/auth/login/login.page.scss b/src/app/auth/login/login.page.scss
index e656e08df723500eb203d9a2004d07dba1ed935a..b0d8c0e587a29e321110d0dd2ced02a09f7d6722 100644
--- a/src/app/auth/login/login.page.scss
+++ b/src/app/auth/login/login.page.scss
@@ -9,4 +9,7 @@ ion-item {
 }
 .ion-text{
     text-align: center;
+  }
+  .alert-danger{
+    color: red;
   }
\ No newline at end of file
diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts
index 74b06ec96280b621d660c3ae335893f18575065f..4f619b3bbfb0dee5682114bb5596c79395c8e638 100644
--- a/src/app/auth/login/login.page.ts
+++ b/src/app/auth/login/login.page.ts
@@ -6,13 +6,14 @@ import { HttpClient } from '@angular/common/http';
 
 import { RestService } from '../../rest.service';
 import { UserService } from 'src/app/services/user.service';
-
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 @Component({
   selector: 'app-login',
   templateUrl: './login.page.html',
   styleUrls: ['./login.page.scss'],
 })
 export class LoginPage implements OnInit {
+  public angForm: FormGroup;
   username = "";
   password = "";
   //username = "";
@@ -20,19 +21,33 @@ export class LoginPage implements OnInit {
   correctCredentials = false;
   loginApi: Observable<any>;
 
-  constructor(private router: Router, public httpClient: HttpClient, public restService: RestService,public userService: UserService) {
-
+  constructor(private router: Router, 
+    public httpClient: HttpClient, 
+    public restService: RestService,
+    public userService: UserService,
+    private fb: FormBuilder) {
+      this.createForm();
   }
 
   ngOnInit() {
   }
 
-
-  login() {
+  createForm() {
+    this.angForm = this.fb.group({
+      username: ['',[ Validators.required ]],
+       
+       password: ['', [Validators.required,Validators.minLength(4) ]],
+      });
+    }
+    login() {
+      
     this.loginApiCall();
   }
 
   loginApiCall() {
+    if (this.angForm.invalid) {
+      return;
+  }
     this.loginApi = this.httpClient.post('http://193.196.52.237:8081/authenticate', {
       "email": this.username,
       "password": this.password
diff --git a/src/app/auth/register/register.page.ts b/src/app/auth/register/register.page.ts
index 96152e11bc93cf4ba6ee55bd1f6d47da434622ac..aeba478eb2795fd507a54cbd72751d53f76c1510 100644
--- a/src/app/auth/register/register.page.ts
+++ b/src/app/auth/register/register.page.ts
@@ -48,7 +48,7 @@ export class RegisterPage implements OnInit {
     if (this.angForm.invalid) {
       return;
   }
-
+    
     this.registerApi = this.httpClient.post('http://193.196.52.237:8081/register', {
       "email": this.email,
       "password": this.password,