diff --git a/frontend/static/index.html b/frontend/static/index.html
index 5afdc602..d15e0777 100644
--- a/frontend/static/index.html
+++ b/frontend/static/index.html
@@ -42,13 +42,16 @@
             <img src="/img/epita.png" alt="Epita" class="center-block">
 	  </a>
 	</div>
-	<div id="clock" class="col-sm-7" ng-class="{expired: time.expired, end: time.end}">
+	<div id="clock" class="col-sm-7" ng-class="{expired: time.expired, end: time.end}" ng-show="time.start || my.team_id">
           <span id="hours">{{ time.hours | time }}</span>
           <span class="point">:</span>
           <span id="min">{{ time.minutes | time }}</span>
           <span class="point">:</span>
           <span id="sec">{{ time.seconds | time }}</span>
 	</div>
+	<div id="clock" class="col-sm-7" ng-show="!(!time.start || my.team_id)">
+          {{ time.start | date:"shortDate" }}
+	</div>
       </div>
       </div>
     </div>
diff --git a/frontend/static/js/app.js b/frontend/static/js/app.js
index 543fb1f3..411cf490 100644
--- a/frontend/static/js/app.js
+++ b/frontend/static/js/app.js
@@ -55,6 +55,7 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
 		    $rootScope.time.end = false;
 		    $rootScope.time.expired = false;
 		}
+		$rootScope.time.start = time.st * 1000;
 		$rootScope.time.duration = time.du;
 		$rootScope.time.remaining = remain;
 		$rootScope.time.hours = Math.floor(remain / 3600);
diff --git a/frontend/static/js/public.js b/frontend/static/js/public.js
index 5d151d33..9261fddd 100644
--- a/frontend/static/js/public.js
+++ b/frontend/static/js/public.js
@@ -75,6 +75,7 @@ angular.module("FICApp")
 		    $scope.time.end = false;
 		    $scope.time.expired = false;
 		}
+		$scope.time.start = time.st * 1000;
 		$scope.time.duration = time.du;
 		$scope.time.remaining = remain;
 		$scope.time.hours = Math.floor(remain / 3600);
diff --git a/frontend/static/public.html b/frontend/static/public.html
index 46dfa240..d2f179b4 100644
--- a/frontend/static/public.html
+++ b/frontend/static/public.html
@@ -42,13 +42,16 @@
             <img src="/img/epita.png" alt="Epita" class="center-block">
 	  </a>
 	</div>
-	<div id="clock" class="col-sm-8" ng-class="{expired: time.expired, end: time.end}">
+	<div id="clock" class="col-sm-7" ng-class="{expired: time.expired, end: time.end}" ng-show="time.hours === 0 || time.hours">
           <span id="hours">{{ time.hours | time }}</span>
           <span class="point">:</span>
           <span id="min">{{ time.minutes | time }}</span>
           <span class="point">:</span>
           <span id="sec">{{ time.seconds | time }}</span>
 	</div>
+	<div id="clock" class="col-sm-7" ng-show="!(time.hours === 0 || time.hours)">
+          {{ time.start | date:"shortDate" }}
+	</div>
       </div>
       </div>
     </div>
diff --git a/frontend/static/views/theme.html b/frontend/static/views/theme.html
index ba17e4d2..4c8ae68b 100644
--- a/frontend/static/views/theme.html
+++ b/frontend/static/views/theme.html
@@ -11,7 +11,7 @@
 	    <hr ng-show="!(my.exercices[current_exercice].hint)">
 	    <ul>
 	      <li><strong>Gain :</strong> {{ themes[current_theme].exercices[current_exercice].gain }} points</li>
-	      <li><strong>Résolu par :</strong> {{ themes[current_theme].exercices[current_exercice].solved }} équipes jusqu'à présent</li>
+	      <li><strong>Résolu par :</strong> {{ themes[current_theme].exercices[current_exercice].solved }} équipes</li>
 	    </ul>
 	  </div>