diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb
index 9fb1f5735..54bc4620e 100644
--- a/lib/trustie/gitlab/helper.rb
+++ b/lib/trustie/gitlab/helper.rb
@@ -40,6 +40,11 @@ module Trustie
                                    username: user.login,
                                    confirm: "true")
             user.gid = u.id
+            user.save
+          end
+          if user.gid.nil?
+            user.gid = u.id
+            user.save
           end
           change_password(u.id, user.hashed_password, user.salt)
         rescue => e