1 files changed, 5 insertions, 4 deletions

diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts
index cd1404d48..467164107 100644
--- a/server/initializers/installer.ts
+++ b/server/initializers/installer.ts
@@ -4,10 +4,10 @@ import { each, series } from 'async'
 import mkdirp = require('mkdirp')
 import passwordGenerator = require('password-generator')
 
-const db = require('./database')
+import { database as db } from './database'
 import { USER_ROLES, CONFIG, LAST_MIGRATION_VERSION } from './constants'
 import { clientsExist, usersExist } from './checker'
-import { logger, createCertsIfNotExist } from '../helpers'
+import { logger, createCertsIfNotExist, root } from '../helpers'
 
 function installApplication (callback) {
   series([
@@ -47,7 +47,7 @@ function createDirectoriesIfNotExist (callback) {
 
   each(Object.keys(storages), function (key, callbackEach) {
     const dir = storages[key]
-    mkdirp(join(__dirname, '..', '..', dir), callbackEach)
+    mkdirp(join(root(), dir), callbackEach)
   }, callback)
 }
 
@@ -65,7 +65,8 @@ function createOAuthClientIfNotExist (callback) {
     const client = db.OAuthClient.build({
       clientId: id,
       clientSecret: secret,
-      grants: [ 'password', 'refresh_token' ]
+      grants: [ 'password', 'refresh_token' ],
+      redirectUris: null
     })
 
     client.save().asCallback(function (err, createdClient) {