diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php
index 341cfa2442..bbb31a87ae 100644
--- a/lib/scm/gitlab.class.php
+++ b/lib/scm/gitlab.class.php
@@ -616,6 +616,7 @@ class gitlab
         $params->per_page = 100;
 
         $allResults = array();
+        $files = array();
         while(true)
         {
             $results = $this->fetch($api, $params);
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index bce732117e..446da06b4e 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -34,11 +34,15 @@
           </tr>
           <tr class='gitlab hide'>
             <th><?php echo $lang->repo->gitlabHost;?></th>
-            <td class='required'><?php echo html::select('gitlabHost', $gitlabHosts, '', "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
+            <td><?php echo html::input('gitlabHost', '', "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabToken;?></th>
+            <td><?php echo html::input('gitlabToken', '', "class='form-control'");?>
           </tr>
           <tr class='gitlab hide'>
             <th><?php echo $lang->repo->gitlabProject;?></th>
-            <td class='required'><?php echo html::select('gitlabProject', array(''), '', "class='form-control chosen'");?>
+            <td><?php echo html::select('gitlabProject', array(''), '', "class='form-control chosen'");?>
           </tr>
           <tr>
             <th><?php echo $lang->repo->name; ?></th>
diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php
index fe9d4a2117..15f6d76846 100644
--- a/module/repo/view/edit.html.php
+++ b/module/repo/view/edit.html.php
@@ -34,15 +34,21 @@
           <tr>
             <th class='thWidth'><?php echo $lang->repo->type; ?></th>
             <td style="width:550px"><?php echo html::select('SCM', $lang->repo->scmList, $repo->SCM, "onchange='scmChanged(this.value)' class='form-control'"); ?></td>
-            <td><span class="tips-git"><?php echo $lang->repo->syncTips; ?></span></td>
+            <td>
+                <span class="tips-git"><?php echo $lang->repo->syncTips; ?></span>
+            </td>
           </tr>
           <tr class='gitlab hide'>
             <th><?php echo $lang->repo->gitlabHost;?></th>
-            <td><?php echo html::select('gitlabHost', $gitlabHosts, $repo->gitlab, "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
+            <td><?php echo html::input('gitlabHost', $repo->client, "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabToken;?></th>
+            <td><?php echo html::input('gitlabToken', $repo->password, "class='form-control'");?>
           </tr>
           <tr class='gitlab hide'>
             <th><?php echo $lang->repo->gitlabProject;?></th>
-            <td><?php echo html::select('gitlabProject', $projects, $repo->project, "class='form-control chosen'");?>
+            <td><?php echo html::select('gitlabProject', $projects, $repo->extra, "class='form-control chosen'");?>
           </tr>
           <tr>
             <th><?php echo $lang->repo->name; ?></th>
@@ -53,8 +59,8 @@
             <th><?php echo $lang->repo->path; ?></th>
             <td class='required'><?php echo html::input('path', $repo->path, "class='form-control'"); ?></td>
             <td class='muted'>
-              <span class="tips-git"><?php echo $lang->repo->example->path->git;?></span>
-              <span class="tips-svn"><?php echo $lang->repo->example->path->svn;?></span>
+                <span class="tips-git"><?php echo $lang->repo->example->path->git;?></span>
+                <span class="tips-svn"><?php echo $lang->repo->example->path->svn;?></span>
             </td>
           </tr>
           <tr>
@@ -66,8 +72,8 @@
             <th><?php echo $lang->repo->client;?></th>
             <td class='required'><?php echo html::input('client',  $repo->client, "class='form-control'")?></td>
             <td class='muted'>
-              <span class="tips-git"><?php echo $lang->repo->example->client->git;?></span>
-              <span class="tips-svn"><?php echo $lang->repo->example->client->svn;?></span>
+                <span class="tips-git"><?php echo $lang->repo->example->client->git;?></span>
+                <span class="tips-svn"><?php echo $lang->repo->example->client->svn;?></span>
             </td>
           </tr>
           <tr class="account-fields hide-gitlab">
@@ -106,7 +112,7 @@
             <th></th>
             <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
-              <?php if(!isonlybody()) echo html::a(inlink('maintain', ""), $lang->goback, '', 'class="btn btn-wide"'); ?>
+              <?php echo html::backButton() ?>
             </td>
           </tr>
         </table>