diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py
index 038534b47..f33cbede6 100644
--- a/frontend/coprs_frontend/coprs/models.py
+++ b/frontend/coprs_frontend/coprs/models.py
@@ -2206,8 +2206,7 @@ class Group(db.Model, helpers.Serializer):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(127))
 
-    # TODO: add unique=True
-    fas_name = db.Column(db.String(127))
+    fas_name = db.Column(db.String(127), unique=True)
 
     @property
     def at_name(self):
diff --git a/frontend/coprs_frontend/coprs/templates/_helpers.html b/frontend/coprs_frontend/coprs/templates/_helpers.html
index 317d82e74..3956dd6f2 100644
--- a/frontend/coprs_frontend/coprs/templates/_helpers.html
+++ b/frontend/coprs_frontend/coprs/templates/_helpers.html
@@ -304,7 +304,7 @@ <h3 class="panel-title"> {{ g.user.name | capitalize}} </h3>
         <span class="badge">{{ g.user.coprs_count }}</span>
         My projects
       </a>
-    {% if config.FAS_LOGIN or config.LDAP_URL %}
+    {% if config.FAS_LOGIN or config.LDAP_URL or config.OIDC_LOGIN %}
       <a href="{{url_for('groups_ns.list_user_groups') }}" class="list-group-item">
         <span class="badge"> {{ user.user_groups|length }} </span>
         My groups
@@ -458,11 +458,6 @@ <h3 class="panel-title">News - <a href="{{ config.NEWS_URL }}">Read All</a></h3>
   {{- copr_url('coprs_ns.copr_package', package.copr, package_name=package.name) -}}
 {% endmacro %}
 
-{%- macro fas_group_href(name) -%}
-https://accounts.fedoraproject.org/group/{{name}}
-{%- endmacro -%}
-
-
 {% macro repo_file_href(copr, repo, arch=None) %}
 {%- if not arch %}
   {{- owner_url('coprs_ns.generate_repo_file',
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/group.html b/frontend/coprs_frontend/coprs/templates/coprs/show/group.html
index e7185d45c..6679298ab 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show/group.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show/group.html
@@ -1,7 +1,7 @@
 {% extends "coprs/group_show.html" %}
 {% block title %}Project List{% endblock %}
 {% block header %}Project List{% endblock %}
-{% from "_helpers.html" import render_pagination, fas_group_href %}
+{% from "_helpers.html" import render_pagination %}
 {% block breadcrumbs %}
 <ol class="breadcrumb">
   <li>
diff --git a/frontend/coprs_frontend/coprs/templates/groups/user_fas_groups.html b/frontend/coprs_frontend/coprs/templates/groups/user_fas_groups.html
index afb4abaea..e35192f4b 100644
--- a/frontend/coprs_frontend/coprs/templates/groups/user_fas_groups.html
+++ b/frontend/coprs_frontend/coprs/templates/groups/user_fas_groups.html
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% from "_helpers.html" import fas_group_href, initialize_datatables %}
+{% from "_helpers.html" import initialize_datatables %}
 {% block title %}Add a Group{% endblock %}
 {% block header %}Add a Group{% endblock %}
 
@@ -37,7 +37,7 @@ <h1>
     <tbody>
     {% for team in teams %}
       <tr>
-        <td><a href="{{ fas_group_href(team) }}">
+        <td><a href="{{ config.GROUP_INFO.link.format(name=team) }}">
           {{ team }}
         </a></td>
         <td>
diff --git a/frontend/coprs_frontend/coprs/views/groups_ns/groups_general.py b/frontend/coprs_frontend/coprs/views/groups_ns/groups_general.py
index 43194250e..ac15e0a1e 100644
--- a/frontend/coprs_frontend/coprs/views/groups_ns/groups_general.py
+++ b/frontend/coprs_frontend/coprs/views/groups_ns/groups_general.py
@@ -10,6 +10,7 @@
 from coprs.logic.coprs_logic import CoprsLogic, PinnedCoprsLogic
 from coprs.logic.users_logic import UsersLogic
 from coprs import app
+from coprs.oidc import oidc_enabled
 
 from ... import db
 from ..misc import login_required
@@ -31,7 +32,7 @@ def activate_group(fas_group):
 
         if fas_group not in flask.g.user.user_teams:
             raise InsufficientRightsException(
-                "User '{}' doesn't have access to fas group {}"
+                "User '{}' doesn't have access to group {}"
                 .format(flask.g.user.username, fas_group))
 
         alias = form.name.data
@@ -41,12 +42,16 @@ def activate_group(fas_group):
         db.session.add(group)
         db.session.commit()
 
-        flask.flash(
-            "FAS group {} is activated in the Copr under the alias {} "
-            .format(fas_group, alias)
-        )
+        # can't have more than one alias for a group
+        if group.name != alias:
+            message = "Group {} already activated as alias {} ".format(
+                fas_group, group.name)
+        else:
+            message = "Group {} is activated in the System under the alias {} ".format(
+                fas_group, alias)
+        flask.flash(message)
         return flask.redirect(url_for(
-            "groups_ns.list_projects_by_group", group_name=alias))
+            "groups_ns.list_projects_by_group", group_name=group.name))
 
     else:
         return flask.render_template(
@@ -85,7 +90,7 @@ def list_projects_by_group(group_name, page=1):
 @groups_ns.route("/list/my")
 @login_required
 def list_user_groups():
-    if not (app.config['FAS_LOGIN'] or app.config['LDAP_URL']):
+    if not (app.config['FAS_LOGIN'] or app.config['LDAP_URL'] or oidc_enabled(app.config)):
         raise ObjectNotFound("Fedora Accounts or LDAP groups not enabled")
 
     teams = flask.g.user.user_teams