diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index 4965687ac7e..8f1ac5798a7 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -4,12 +4,12 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 export default Ember.Component.extend({
   @computed("model.public")
   canJoinGroup(publicGroup) {
-    return !!(this.currentUser) && publicGroup;
+    return publicGroup;
   },
 
   @computed('model.allow_membership_requests', 'model.alias_level')
   canRequestMembership(allowMembershipRequests, aliasLevel) {
-    return !!(this.currentUser) && allowMembershipRequests && aliasLevel === 99;
+    return allowMembershipRequests && aliasLevel === 99;
   },
 
   @computed("model.is_group_user", "model.id", "groupUserIds")
@@ -21,11 +21,29 @@ export default Ember.Component.extend({
     }
   },
 
+  @computed
+  joinGroupAction() {
+    return this.currentUser ? 'joinGroup' : 'showLogin';
+  },
+
+  @computed
+  requestMembershipAction() {
+    return this.currentUser ? 'requestMembership' : 'showLogin';
+  },
+
   actions: {
+    showLogin() {
+      this.sendAction('showLogin');
+    },
+
     joinGroup() {
       this.set('updatingMembership', true);
       const model = this.get('model');
 
+      if (!!(this.currentUser)) {
+
+      }
+
       model.addMembers(this.currentUser.get('username')).then(() => {
         model.set('is_group_user', true);
       }).catch(popupAjaxError).finally(() => {
diff --git a/app/assets/javascripts/discourse/controllers/groups.js.es6 b/app/assets/javascripts/discourse/controllers/groups.js.es6
index d8ce08f3227..f427b613160 100644
--- a/app/assets/javascripts/discourse/controllers/groups.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups.js.es6
@@ -11,6 +11,10 @@ export default Ember.Controller.extend({
   actions: {
     loadMore() {
       this.get('groups').loadMore();
+    },
+
+    showLogin() {
+      return this.get('application').send('appRouteAction', 'showLogin');
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
index bd2d456feee..1fc14e88970 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -6,7 +6,7 @@
         label="groups.leave"
         disabled=updatingMembership}}
   {{else}}
-    {{d-button action="joinGroup"
+    {{d-button action=joinGroupAction
         class="group-index-join"
         icon="plus"
         label="groups.join"
@@ -22,7 +22,7 @@
           disabled=true}}
     {{/if}}
   {{else}}
-    {{d-button action="requestMembership"
+    {{d-button action=requestMembershipAction
         class="group-index-request"
         icon="envelope"
         label="groups.request"}}
diff --git a/app/assets/javascripts/discourse/templates/groups.hbs b/app/assets/javascripts/discourse/templates/groups.hbs
index a9bdfcd4346..2699777f5a6 100644
--- a/app/assets/javascripts/discourse/templates/groups.hbs
+++ b/app/assets/javascripts/discourse/templates/groups.hbs
@@ -47,7 +47,8 @@
                   {{#group-membership-button model=group
                       createNewMessageViaParams='createNewMessageViaParams'
                       showMembershipStatus=true
-                      groupUserIds=groups.extras.group_user_ids}}
+                      groupUserIds=groups.extras.group_user_ids
+                      showLogin='showLogin'}}
 
                     {{d-button icon="ban"
                         label=(if group.automatic 'groups.automatic_group' 'groups.closed_group')
diff --git a/test/javascripts/acceptance/groups-test.js.es6 b/test/javascripts/acceptance/groups-test.js.es6
index aaa1411cacd..1c9d5d8d872 100644
--- a/test/javascripts/acceptance/groups-test.js.es6
+++ b/test/javascripts/acceptance/groups-test.js.es6
@@ -6,7 +6,9 @@ test("Browsing Groups", () => {
   visit("/groups");
 
   andThen(() => {
-    equal(count('.groups-table-row'), 18, 'it displays visible groups');
+    equal(count('.groups-table-row'), 2, 'it displays visible groups');
+    equal(find('.group-index-join').length, 1, 'it show button to join group');
+    equal(find('.group-index-request').length, 1, 'it show button to request for group membership');
   });
 
   click("a[href='/groups/discourse/members']");
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js.es6
index 078ffbd8578..1baa42b560e 100644
--- a/test/javascripts/fixtures/groups-fixtures.js.es6
+++ b/test/javascripts/fixtures/groups-fixtures.js.es6
@@ -1,3 +1,3 @@
 export default {
-  "/groups.json": {"groups":[{"id":1,"automatic":true,"name":"admins","user_count":2,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":3,"automatic":true,"name":"staff","user_count":2,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":10,"automatic":true,"name":"trust_level_0","user_count":2,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":11,"automatic":true,"name":"trust_level_1","user_count":2,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":12,"automatic":true,"name":"trust_level_2","user_count":2,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":13,"automatic":true,"name":"trust_level_3","user_count":2,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":14,"automatic":true,"name":"trust_level_4","user_count":2,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":2,"automatic":true,"name":"moderators","user_count":1,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":41,"automatic":false,"name":"my_group_0","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":42,"automatic":false,"name":"my_group_1","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":43,"automatic":false,"name":"my_group_2","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":44,"automatic":false,"name":"my_group_3","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":45,"automatic":false,"name":"my_group_4","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":46,"automatic":false,"name":"my_group_5","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":47,"automatic":false,"name":"my_group_6","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":48,"automatic":false,"name":"my_group_7","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":49,"automatic":false,"name":"my_group_8","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null},{"id":50,"automatic":false,"name":"discourse","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null}],"total_rows_groups":19,"load_more_groups":"/groups?page=1"}
+  "/groups.json": {"groups":[{"id":41,"automatic":false,"name":"discourse","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":"","bio_cooked":null,"public":true,"allow_membership_requests":false,"full_name":"Awesome Team"},{"id":42,"automatic":false,"name":"Macdonald","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":true,"full_name":null}],"extras":{"group_user_ids":[]},"total_rows_groups":2,"load_more_groups":"/groups?page=1"}
 }