Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
===================================================================
diff -u -ra5caeb34843b9f5ac91452490ec06d411e0e968a -r273a6559d40615f601ac0c81fa46899513523b0d
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision a5caeb34843b9f5ac91452490ec06d411e0e968a)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 273a6559d40615f601ac0c81fa46899513523b0d)
@@ -123,7 +123,7 @@
 	boolean isSpTeamworkEnabled = Configuration.isLamsModuleAvailable(Configuration.TEAMWORK_MODULE_CLASS);
 	if (isSpTeamworkEnabled) {
 	    moreLinks.add(
-		    new IndexLinkBean("index.teamwork", "javascript:openTeamworkWindow()", "fa fa-fw fa-handshake",
+		    new IndexLinkBean("index.teamwork", "javascript:openTeamworkWindow(" + organisationId + ")", "fa fa-fw fa-handshake-o",
 			    null));
 	}
 
@@ -142,6 +142,9 @@
 
 	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/web/includes/javascript/openUrls.js
===================================================================
diff -u -ra5caeb34843b9f5ac91452490ec06d411e0e968a -r273a6559d40615f601ac0c81fa46899513523b0d
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision a5caeb34843b9f5ac91452490ec06d411e0e968a)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 273a6559d40615f601ac0c81fa46899513523b0d)
@@ -206,6 +206,6 @@
 	}
 }
 
-function openTeamworkWindow (){
-	window.open('teamwork/show.do', '_blank');
+function openTeamworkWindow (organisationId){
+	window.open('teamwork/organisation.do?organisationId=' + organisationId, '_blank');
 }
\ No newline at end of file