diff --git a/src/components/pages/LoginPage.vue b/src/components/pages/LoginPage.vue
index 778a6ed3aaf8c79e6459ea42f3a0c73a21399513..4988bb6ae585d73a5af2c9717e82558b9c79e175 100644
--- a/src/components/pages/LoginPage.vue
+++ b/src/components/pages/LoginPage.vue
@@ -150,7 +150,7 @@ export default {
             'id': response.data.user._id,
             'name': response.data.user.name,
             'role': response.data.user.role,
-            'pageList': response.data.user.page_list
+            'pageList': response.data.page_list
           }
           this.$store.commit('setUser', data)
           this.$router.push({name: 'LandingPage'})
diff --git a/src/components/pages/PanelAdministrator.vue b/src/components/pages/PanelAdministrator.vue
index 5ceb31856a306d00446e2c603222fa4087b2212f..e8703e0272a8ede9a5239b75c74531c838daa05d 100644
--- a/src/components/pages/PanelAdministrator.vue
+++ b/src/components/pages/PanelAdministrator.vue
@@ -152,9 +152,10 @@ export default {
     }
     this.totalRows = this.items.length
     this.$store.commit('changed','Jenis Anggaran')
-    
-    this.fillAdmin()
-    this.fillDataTable('top')
+    if (this.$store.state.user.role === 2 ) {
+      this.fillAdmin()
+      this.fillDataTable('top')
+    }
   },
   watch : {
     tabIndex() {
@@ -243,7 +244,10 @@ export default {
               this.dataTable.items.push({id:response.subdata[i]._id, activity_name:response.subdata[i].name, admin_name : admin})
             }
             this.dataTable.current_item.id = response.data._id.$oid
-            this.dataTable.current_item.admin_name = response.admin.name
+            if( response.admin !== null )
+              this.dataTable.current_item.admin_name = response.admin.name
+            else 
+              this.dataTable.current_item.admin_name = '--'
             this.dataTable.current_item.activity_name = response.data.name
             
             this.dataStack.push(idPage);