Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
===================================================================
diff -u -r273a6559d40615f601ac0c81fa46899513523b0d -reb835b7d5fabc6550e22baefc313476b8fa1395d
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 273a6559d40615f601ac0c81fa46899513523b0d)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision eb835b7d5fabc6550e22baefc313476b8fa1395d)
@@ -123,8 +123,8 @@
 	boolean isSpTeamworkEnabled = Configuration.isLamsModuleAvailable(Configuration.TEAMWORK_MODULE_CLASS);
 	if (isSpTeamworkEnabled) {
 	    moreLinks.add(
-		    new IndexLinkBean("index.teamwork", "javascript:openTeamworkWindow(" + organisationId + ")", "fa fa-fw fa-handshake-o",
-			    null));
+		    new IndexLinkBean("index.teamwork", "javascript:openTeamworkMonitorWindow(" + organisationId + ")",
+			    "fa fa-fw fa-handshake-o", null));
 	}
 
 	if (isAppAdmin) {
@@ -143,8 +143,6 @@
 	if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)) {
 	    if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
 
-
-
 		if ((!isAppAdmin) && (roles.contains(Role.ROLE_GROUP_MANAGER))) {
 		    moreLinks.add(
 			    new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + organisationId + ")",
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
===================================================================
diff -u -rb6d55d571ea99a87a367fec36df40ec45627b0ea -reb835b7d5fabc6550e22baefc313476b8fa1395d
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision b6d55d571ea99a87a367fec36df40ec45627b0ea)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision eb835b7d5fabc6550e22baefc313476b8fa1395d)
@@ -22,17 +22,9 @@
  */
 package org.lamsfoundation.lams.web;
 
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.index.IndexLinkBean;
@@ -55,9 +47,15 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.HtmlUtils;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *
@@ -83,6 +81,10 @@
 	if (request.isUserInRole(Role.AUTHOR)) {
 	    request.setAttribute("showQbCollectionsLink", true);
 	}
+	boolean isSpTeamworkEnabled = Configuration.isLamsModuleAvailable(Configuration.TEAMWORK_MODULE_CLASS);
+	if (isSpTeamworkEnabled) {
+	    request.setAttribute("showTeamworkLink", true);
+	}
 
 	// check if this is user's first login; some action (like displaying a dialog for disabling tutorials) can be
 	// taken based on that parameter; immediatelly, the value in DB is updated
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r1c1dba293a78b381a5e8781cda032537b4dfbfbb -reb835b7d5fabc6550e22baefc313476b8fa1395d
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 1c1dba293a78b381a5e8781cda032537b4dfbfbb)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision eb835b7d5fabc6550e22baefc313476b8fa1395d)
@@ -206,6 +206,10 @@
 	}
 }
 
-function openTeamworkWindow (organisationId){
+function openTeamworkMonitorWindow (organisationId){
 	location.href = '/lams/teamwork/organisation.do?organisationId=' + organisationId;
+}
+
+function openTeamworkLearnerWindow (){
+	location.href = '/lams/teamwork/learner.do';
 }
\ No newline at end of file
Index: lams_central/web/main.jsp
===================================================================
diff -u -rb6d55d571ea99a87a367fec36df40ec45627b0ea -reb835b7d5fabc6550e22baefc313476b8fa1395d
--- lams_central/web/main.jsp	(.../main.jsp)	(revision b6d55d571ea99a87a367fec36df40ec45627b0ea)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision eb835b7d5fabc6550e22baefc313476b8fa1395d)
@@ -213,14 +213,22 @@
 						</a>
 					</li>
 					
+					<c:if test="${showTeamworkLink}">
+						<li>
+							<a href="#" id="showTeamworkButton" onclick="javascript:openTeamworkLearnerWindow(); return false;">
+								<i class="fa fa-handshake-o"></i> <fmt:message key="index.teamwork"/>
+							</a>
+						</li>
+					</c:if>
+
 					<c:if test="${showQbCollectionsLink}">
 						<li>
 							<a href="#" id="showQbCollectionsButton" onclick="javascript:openQbCollections(); return false;">
 								<i class="fa fa-bank"></i> <fmt:message key="index.qb.collections"/>
 							</a>
 						</li>
 					</c:if>
-					
+
 					<c:forEach var="adminlink" items="${adminLinks}">
 						
 						<c:choose>
@@ -334,4 +342,4 @@
 <csrf:form id="csrf-form" method="post" action=""></csrf:form>
 
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file