diff --git a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
index 6d69a37316..37ba50f92a 100644
--- a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
+++ b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
@@ -28,10 +28,10 @@
 
 {% for grp in myGroups %}
     <li {% if grp.id == eContext.context.groupId %}class="current_group"{% endif %}>
-        {% if grp.id == active_group.id %}
-            <a href="{{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
+        {% if grp.id == ome.active_group %}
+            <a href="#" data-gid="{{ grp.id }}">
         {% else %}
-            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}&url={{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
+            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}" data-gid="{{ grp.id }}">
         {% endif %}
             <img
             {% if grp.getDetails.getPermissions.isGroupWrite %} src="{% static 'webclient/image/group_green16.png' %}"
@@ -54,7 +54,7 @@
 
     {% for grp in groups %}
         <li {% if grp.id == eContext.context.groupId %}class="current_group"{% endif %}>
-            <a href="#" data-gid="{{ grp.id }}">
+            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}&url={{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
                 <img
                 {% if grp.getDetails.getPermissions.isGroupWrite %} src="{% static 'webclient/image/group_green16.png' %}"
                 {% else %}