diff --git a/frontend/static/views/home.html b/frontend/static/views/home.html
index 134052b3..ad65dc54 100644
--- a/frontend/static/views/home.html
+++ b/frontend/static/views/home.html
@@ -15,7 +15,7 @@
 </div>
 
 <div class="card-columns">
-  <div class="card niceborder excard" ng-repeat="(k,theme) in themes" ng-click="goTheme()" ng-class="{'border-success': theme.solved > 0, 'border-warning': theme.exercice_coeff_max > 1}">
+  <div class="card niceborder excard" ng-repeat="(k,theme) in themes" ng-click="goTheme()" ng-class="{'border-success': my.team_id && theme.solved > 0, 'border-warning': theme.exercice_coeff_max > 1}">
     <div class="card-img-top theme-card" ng-show="theme.image" style="background-image: url({{ theme.image }})"></div>
     <div class="card-body text-indent">
       <h5 class="card-title">
diff --git a/frontend/static/views/tag.html b/frontend/static/views/tag.html
index 6f606d28..7dc8910a 100644
--- a/frontend/static/views/tag.html
+++ b/frontend/static/views/tag.html
@@ -1,5 +1,5 @@
 <div class="card-columns">
-  <div class="card niceborder excard" ng-repeat="ex in exercices" ng-click="goDefi()" ng-class="{'border-success': ex.exercice.solved, 'border-secondary': !my.exercices[ex.eid], 'border-warning': ex.exercice.curcoeff > 1.0}">
+  <div class="card niceborder excard" ng-repeat="ex in exercices" ng-click="goDefi()" ng-class="{'border-success': my.team_id && ex.exercice.solved, 'border-secondary': !my.exercices[ex.eid], 'border-warning': ex.exercice.curcoeff > 1.0}">
     <div class="card-img-top theme-card" ng-show="ex.theme.image" style="background-image: url({{ ex.theme.image }})"></div>
     <div class="card-body">
       <h6 class="card-title">