diff --git a/app/partials/views/modules/login-form.jade b/app/partials/views/modules/login-form.jade
index 0fe86cae..14a9477e 100644
--- a/app/partials/views/modules/login-form.jade
+++ b/app/partials/views/modules/login-form.jade
@@ -13,4 +13,10 @@ div.login-form-container(tg-login)
             a.button.button-login.button-gray(href="", title="Sign in") Sign in
             input(type="submit", style="display:none")
 
+        fieldset
+            a.button.button-github(href="", title="enter with your github account")
+                span.icon.icon-github
+                span Login with Github
+            input(type="submit", style="display:none")
+
     tg-public-register-message
diff --git a/app/partials/views/modules/register-form.jade b/app/partials/views/modules/register-form.jade
index 514a476c..340616a5 100644
--- a/app/partials/views/modules/register-form.jade
+++ b/app/partials/views/modules/register-form.jade
@@ -17,13 +17,19 @@ div.register-form-container(tg-register)
 
         fieldset
             input(type="password", name="password", ng-model="data.password",
-                data-required="true", data-minlength="4", 
+                data-required="true", data-minlength="4",
                 placeholder="Set a password (case sensitive)")
 
         fieldset
             a.button.button-register.button-gray(href="", title="Sign up") Sign up
             input(type="submit", class="hidden")
 
+        fieldset
+            a.button.button-github(href="", title="enter with your github account")
+                span.icon.icon-github
+                span Sign Up with Github
+            input(type="submit", style="display:none")
+
         // Only displays terms notice when terms plugin is loaded.
         tg-terms-notice
 
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index f5a060e1..28348313 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -34,7 +34,7 @@ a.button-green {
 a.button-gray {
     background: $button-gray;
     &:hover {
-        background: $button-gray-hover;
+        background: $fresh-taiga;
         color: $white;
     }
     span {
@@ -102,3 +102,18 @@ a.button-bulk {
         background: $fresh-taiga;
     }
 }
+.button-github {
+    @extend %button;
+    background: $grayer;
+    vertical-align: middle;
+    .icon {
+        @extend %large;
+        color: $white;
+        margin-right: .5rem;
+        vertical-align: text-bottom;
+    }
+    &:hover {
+        @include transition (background .3s linear);
+        background: $black;
+    }
+}
diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss
index 8e62a629..3f53e123 100644
--- a/app/styles/layout/login.scss
+++ b/app/styles/layout/login.scss
@@ -1,5 +1,3 @@
-
-
 .login-main {
     //@include table-flex(center, center, flex, row, wrap, center);
     @include display(flex);
@@ -60,11 +58,7 @@
     .button {
         color: $white;
         display: block;
-        margin-bottom: .5rem;
         text-align: center;
-        &:hover {
-            background: $fresh-taiga;
-        }
     }
     a {
         &:hover {
diff --git a/app/styles/modules/auth/login-form.scss b/app/styles/modules/auth/login-form.scss
index 432ad477..40d4a36c 100644
--- a/app/styles/modules/auth/login-form.scss
+++ b/app/styles/modules/auth/login-form.scss
@@ -1,5 +1,4 @@
 .login-form-container {
-    //display: none;
     .login-password {
         position: relative;
     }