diff --git a/components/Events/Create/NewOrganizationForm.vue b/components/Events/Create/NewOrganizationForm.vue
index f039ddd..e844c75 100644
--- a/components/Events/Create/NewOrganizationForm.vue
+++ b/components/Events/Create/NewOrganizationForm.vue
@@ -39,6 +39,7 @@
       :error-messages="errors.collect('phone')"
       v-validate="'required'"
       data-vv-name="phone"
+      type="number"
       required
     ></v-text-field>
     <v-text-field
@@ -81,7 +82,7 @@ export default {
       pic: '',
       name: '',
       email: '',
-      phone: '',
+      phone: 0,
       website: '',
       instagramLink: '',
       twitterLink: '',
diff --git a/components/Events/EventList.vue b/components/Events/EventList.vue
index 06d22af..9290cd6 100644
--- a/components/Events/EventList.vue
+++ b/components/Events/EventList.vue
@@ -1,13 +1,14 @@
 <template>
   <div>
-    <event-preview v-for="event in events" 
-      :key="event.id" 
+    <event-preview v-for="event in events"
+      :key="event.id"
       :id="event.id"
-      :slug="event.slug" 
-      :title="event.title" 
-      :organization="event.organization" 
-      :description="event.description" />
-  </div>  
+      :slug="event.slug"
+      :title="event.title"
+      :organization="event.organization"
+      :description="event.description"
+      :registrationLink="event.registrationLink"/>
+  </div>
 </template>
 
 <script>
@@ -21,7 +22,7 @@ export default {
   props: {
     events: {
       type: Array,
-      required: true,
+      required: false,
     }
   }
 }
diff --git a/components/Events/EventPreview.vue b/components/Events/EventPreview.vue
index 3c0d055..978ed26 100644
--- a/components/Events/EventPreview.vue
+++ b/components/Events/EventPreview.vue
@@ -5,11 +5,13 @@
     <v-card-title primary-title>
       <div>
         <h3 class="headline mb-0">{{ title }}</h3>
-        <div> {{ description }} </div>
+        <div> {{ description }}  </div>
+
       </div>
     </v-card-title>
     <v-card-actions>
-      <v-btn flat color="secondary" @click="$router.push('/events/' + slug)">Daftar</v-btn>
+      <!--<a  v-if="registrationLink != ''" class="btn btn&#45;&#45;flat secondary&#45;&#45;text" :href="registrationLink" target="_blank">Daftar</a>-->
+      <v-btn v-show="registrationLink != '' " flat color="secondary" v-bind:href="registrationLink">Daftar</v-btn>
       <v-btn flat color="orange">Bagikan</v-btn>
     </v-card-actions>
   </v-card>
@@ -39,7 +41,11 @@ export default {
       type: String,
       required: true,
     },
+    registrationLink :{
+      type: String,
+      required: true,
+    }
   }
-  
+
 }
 </script>
diff --git a/pages/login.vue b/pages/login.vue
index 425e431..978ac4c 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,9 +1,9 @@
 <template>
   <v-layout align-center justify-center>
-    <v-flex xs12 
-            sm4 
-            md4 
-            text-xs-center 
+    <v-flex xs12
+            sm4
+            md4
+            text-xs-center
             mt-5>
       <h3>Masuk kedalam sistem MozSpaceJKT</h3>
       <form>
@@ -60,7 +60,7 @@ export default {
               password: this.password,
             }
           }).then(() => {
-            this.$toast.error('Error while authenticating')
+            this.$toast.success('Success authenticating')
           }).catch((e) => {
             this.$toast.error('Error while authenticating')
           })