diff --git a/app/Controller/User.php b/app/Controller/User.php
index 189d068d2..10a3a931d 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -60,7 +60,9 @@ class User extends Base
      */
     public function create(array $values = array(), array $errors = array())
     {
-        $this->response->html($this->template->layout('user/new', array(
+        $is_remote = $this->request->getIntegerParam('remote') == 1 || (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1);
+
+        $this->response->html($this->template->layout($is_remote ? 'user/create_remote' : 'user/create_local', array(
             'timezones' => $this->config->getTimezones(true),
             'languages' => $this->config->getLanguages(true),
             'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index c40574d9a..5f55f3e86 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 37f759b2d..90c029ba4 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 7d5a3c56f..ecaf8a237 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 4093947ff..ddbb26c35 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 558c4f4d2..1c4c76eef 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -998,4 +998,6 @@ return array(
     'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => 'Si vous cochez la case « Interdir le formulaire d\'authentification », les identifiants entrés dans le formulaire d\'authentification seront ignorés.',
     'By @%s on Gitlab' => 'Par @%s sur Gitlab',
     'Gitlab issue comment created' => 'Commentaire créé sur un ticket Gitlab',
+    'New remote user' => 'Créer un utilisateur distant',
+    'New local user' => 'Créer un utilisateur local',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index 5d82f3e10..f1bd1453f 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 5493d2182..6dd60c183 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 3ced5ea14..e52f82b67 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 688f988dd..ed8be05b5 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index c61ec77cf..9f8641a0f 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index b5f4d0e0b..68de0368d 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 40e499520..3b7d678cc 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 7a731c15a..f33693411 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 73c94287e..db552359b 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index ae81e16ac..c4d608bdd 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 61210dddb..afb887449 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 37bbda950..cd2518fd1 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -996,4 +996,6 @@ return array(
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
     // 'By @%s on Gitlab' => '',
     // 'Gitlab issue comment created' => '',
+    // 'New remote user' => '',
+    // 'New local user' => '',
 );
diff --git a/app/Model/User.php b/app/Model/User.php
index 36b7194c2..b6804abc2 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -377,6 +377,7 @@ class User extends Base
             new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), self::TABLE, 'id'),
             new Validators\Email('email', t('Email address invalid')),
             new Validators\Integer('is_admin', t('This value must be an integer')),
+            new Validators\Integer('is_ldap_user', t('This value must be an integer')),
         );
     }
 
@@ -409,7 +410,12 @@ class User extends Base
             new Validators\Required('username', t('The username is required')),
         );
 
-        $v = new Validator($values, array_merge($rules, $this->commonValidationRules(), $this->commonPasswordValidationRules()));
+        if (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) {
+            $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+        }
+        else {
+            $v = new Validator($values, array_merge($rules, $this->commonValidationRules(), $this->commonPasswordValidationRules()));
+        }
 
         return array(
             $v->execute(),
diff --git a/app/Template/user/new.php b/app/Template/user/create_local.php
similarity index 93%
rename from app/Template/user/new.php
rename to app/Template/user/create_local.php
index 0db1e824e..aeec300f9 100644
--- a/app/Template/user/new.php
+++ b/app/Template/user/create_local.php
@@ -2,6 +2,7 @@
     <div class="page-header">
         <ul>
             <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
         </ul>
     </div>
     <section>
diff --git a/app/Template/user/create_remote.php b/app/Template/user/create_remote.php
new file mode 100644
index 000000000..52661585e
--- /dev/null
+++ b/app/Template/user/create_remote.php
@@ -0,0 +1,57 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
+        </ul>
+    </div>
+    <form method="post" action="<?= $this->url->href('user', 'save') ?>" autocomplete="off">
+
+        <?= $this->form->csrf() ?>
+        <?= $this->form->hidden('is_ldap_user', array('is_ldap_user' => 1)) ?>
+
+        <div class="form-column">
+            <?= $this->form->label(t('Username'), 'username') ?>
+            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?><br/>
+
+            <?= $this->form->label(t('Name'), 'name') ?>
+            <?= $this->form->text('name', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Email'), 'email') ?>
+            <?= $this->form->email('email', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Google Id'), 'google_id') ?>
+            <?= $this->form->password('google_id', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Github Id'), 'github_id') ?>
+            <?= $this->form->password('github_id', $values, $errors) ?><br/>
+        </div>
+
+        <div class="form-column">
+            <?= $this->form->label(t('Add project member'), 'project_id') ?>
+            <?= $this->form->select('project_id', $projects, $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Timezone'), 'timezone') ?>
+            <?= $this->form->select('timezone', $timezones, $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Language'), 'language') ?>
+            <?= $this->form->select('language', $languages, $values, $errors) ?><br/>
+
+            <?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+        </div>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'user', 'index') ?>
+        </div>
+    </form>
+    <div class="alert alert-info">
+        <ul>
+            <li><?= t('Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.') ?></li>
+            <li><?= t('If you check the box "Disallow login form", credentials entered in the login form will be ignored.') ?></li>
+        </ul>
+    </div>
+</section>
\ No newline at end of file
diff --git a/app/Template/user/index.php b/app/Template/user/index.php
index fc575466d..edf043a6d 100644
--- a/app/Template/user/index.php
+++ b/app/Template/user/index.php
@@ -2,7 +2,8 @@
     <div class="page-header">
         <?php if ($this->user->isAdmin()): ?>
         <ul>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
         </ul>
         <?php endif ?>
     </div>
diff --git a/app/Template/user/layout.php b/app/Template/user/layout.php
index e60ab77d0..a27f359ba 100644
--- a/app/Template/user/layout.php
+++ b/app/Template/user/layout.php
@@ -3,7 +3,8 @@
         <?php if ($this->user->isAdmin()): ?>
         <ul>
             <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
         </ul>
         <?php endif ?>
     </div>