diff --git a/client/components/admin/admin-users-edit.vue b/client/components/admin/admin-users-edit.vue
new file mode 100644
index 00000000..bef7c233
--- /dev/null
+++ b/client/components/admin/admin-users-edit.vue
@@ -0,0 +1,158 @@
+<template lang='pug'>
+  v-container(fluid, grid-list-lg)
+    v-layout(row, wrap)
+      v-flex(xs12)
+        .admin-header
+          v-icon(size='80', color='grey lighten-2') perm_identity
+          .admin-header-title
+            .headline.blue--text.text--darken-2 Users
+            .subheading.grey--text Manage users
+          v-spacer
+          v-btn(outline, color='grey', large, @click='refresh')
+            v-icon refresh
+          v-btn(color='primary', large, depressed, @click='authorizeUser')
+            v-icon(left) lock_outline
+            span Authorize Social User
+          v-btn(color='primary', large, depressed, @click='createUser')
+            v-icon(left) add
+            span New Local User
+        v-card.mt-3
+          v-data-table(
+            v-model='selected'
+            :items='users',
+            :headers='headers',
+            :search='search',
+            :pagination.sync='pagination',
+            :rows-per-page-items='[15]'
+            hide-actions,
+            disable-initial-sort
+          )
+            template(slot='headers', slot-scope='props')
+              tr
+                th.text-xs-left(
+                  v-for='header in props.headers'
+                  :key='header.text'
+                  :width='header.width'
+                  :class='[`column`, header.sortable ? `sortable` : ``, pagination.descending ? `desc` : `asc`, header.value === pagination.sortBy ? `active` : ``]'
+                  @click='changeSort(header.value)'
+                )
+                  | {{ header.text }}
+                  v-icon(small, v-if='header.sortable') arrow_upward
+            template(slot='items', slot-scope='props')
+              tr.is-clickable(:active='props.selected', @click='$router.push("/users/" + props.item.id)')
+                //- td
+                  v-checkbox(hide-details, :input-value='props.selected', color='blue darken-2', @click='props.selected = !props.selected')
+                td.text-xs-right {{ props.item.id }}
+                td: strong {{ props.item.name }}
+                td {{ props.item.email }}
+                td {{ props.item.providerKey }}
+                td {{ props.item.createdAt | moment('from') }}
+                td
+                  v-menu(bottom, right, min-width='200')
+                    v-btn(icon, slot='activator'): v-icon.grey--text.text--darken-1 more_horiz
+                    v-list
+                      v-list-tile(@click='')
+                        v-list-tile-action
+                          v-icon(color='primary') edit
+                        v-list-tile-content
+                          v-list-tile-title Edit
+                      v-list-tile(@click='')
+                        v-list-tile-action
+                          v-icon(color='red') block
+                        v-list-tile-content
+                          v-list-tile-title Block
+            template(slot='no-data')
+              .pa-3
+                v-alert(icon='warning', :value='true', outline) No users to display!
+          .text-xs-center.py-2
+            v-pagination(v-model='pagination.page', :length='pages')
+
+    user-authorize(v-model='isAuthorizeDialogShown')
+    user-create(v-model='isCreateDialogShown')
+</template>
+
+<script>
+import usersQuery from 'gql/admin/users/users-query-list.gql'
+
+import UserAuthorize from './admin-users-authorize.vue'
+import UserCreate from './admin-users-create.vue'
+
+export default {
+  components: {
+    UserAuthorize,
+    UserCreate
+  },
+  data() {
+    return {
+      selected: [],
+      pagination: {},
+      users: [],
+      headers: [
+        { text: 'ID', value: 'id', width: 80, sortable: true },
+        { text: 'Name', value: 'name', sortable: true },
+        { text: 'Email', value: 'email', sortable: true },
+        { text: 'Provider', value: 'provider', sortable: true },
+        { text: 'Created', value: 'createdAt', sortable: true },
+        { text: '', value: 'actions', sortable: false, width: 50 }
+      ],
+      search: '',
+      isAuthorizeDialogShown: false,
+      isCreateDialogShown: false
+    }
+  },
+  computed: {
+    pages () {
+      if (this.pagination.rowsPerPage == null || this.pagination.totalItems == null) {
+        return 0
+      }
+
+      return Math.ceil(this.pagination.totalItems / this.pagination.rowsPerPage)
+    }
+  },
+  methods: {
+    authorizeUser() {
+      this.isAuthorizeDialogShown = true
+    },
+    createUser() {
+      this.isCreateDialogShown = true
+    },
+    async refresh() {
+      await this.$apollo.queries.users.refetch()
+      this.$store.commit('showNotification', {
+        message: 'Users list has been refreshed.',
+        style: 'success',
+        icon: 'cached'
+      })
+    },
+    changeSort (column) {
+      if (this.pagination.sortBy === column) {
+        this.pagination.descending = !this.pagination.descending
+      } else {
+        this.pagination.sortBy = column
+        this.pagination.descending = false
+      }
+    },
+    toggleAll () {
+      if (this.selected.length) {
+        this.selected = []
+      } else {
+        this.selected = this.items.slice()
+      }
+    }
+  },
+  apollo: {
+    users: {
+      query: usersQuery,
+      fetchPolicy: 'network-only',
+      update: (data) => data.users.list,
+      watchLoading (isLoading) {
+        this.$store.commit(`loading${isLoading ? 'Start' : 'Stop'}`, 'admin-users-refresh')
+      }
+    }
+  }
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/config.sample.yml b/config.sample.yml
index bb2944f7..4cda0685 100644
--- a/config.sample.yml
+++ b/config.sample.yml
@@ -8,7 +8,7 @@
 # Port the server should listen to
 # ---------------------------------------------------------------------
 
-port: 80
+port: 3000
 
 # ---------------------------------------------------------------------
 # IP address the server should listen to
diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile
index 51109bdc..21a242f5 100644
--- a/dev/build/Dockerfile
+++ b/dev/build/Dockerfile
@@ -40,7 +40,7 @@ COPY --from=assets /var/wiki/assets ./assets
 COPY --from=assets /var/wiki/node_modules ./node_modules
 COPY --from=assets /var/wiki/server ./server
 COPY ./server ./server
-COPY ./config.sample.yml ./config.yml
+COPY ./dev/build/config.yml ./config.yml
 COPY ./package.json ./package.json
 COPY ./LICENSE ./LICENSE
 
diff --git a/dev/build/config.yml b/dev/build/config.yml
new file mode 100644
index 00000000..b5c030df
--- /dev/null
+++ b/dev/build/config.yml
@@ -0,0 +1,16 @@
+port: $(PORT)
+bindIP: 0.0.0.0
+db:
+  type: $(DB_TYPE)
+  host: $(DB_HOST)
+  port: $(DB_PORT)
+  user: $(DB_USER)
+  pass: $(DB_PASS)
+  db: $(DB_NAME)
+  storage: $(DB_FILEPATH)
+redis:
+  host: $(REDIS_HOST)
+  port: $(REDIS_PORT)
+  db: $(REDIS_DB)
+  password: $(REDIS_PASS)
+logLevel: info
diff --git a/dev/docker/config.yml b/dev/docker/config.yml
index a35c3b4f..7003e329 100644
--- a/dev/docker/config.yml
+++ b/dev/docker/config.yml
@@ -1,7 +1,5 @@
 port: 3000
-paths:
-  content: ./content
-  data: ./data
+bindIP: 0.0.0.0
 db:
   type: postgres
   host: db