diff --git a/app/views/comments/comments_all.html.erb b/app/views/comments/comments_all.html.erb
index 747f81fce..43a895db7 100644
--- a/app/views/comments/comments_all.html.erb
+++ b/app/views/comments/comments_all.html.erb
@@ -22,6 +22,8 @@
         <td><%= comment.text %></td>
         <% if !comment.user %>
            <td> <%= 'User undefined' %> </td>
+        <% elsif @exercise.user == current_user %>
+            <td><%= 'yourself' %></td>
         <% elsif comment.user.first_name.nil?%>
             <td><%= link_to "User#{comment.user.id}", user_path(comment.user)%></td>
         <% else %>
diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb
index 861e8913f..b9e42d412 100644
--- a/app/views/comments/index.html.erb
+++ b/app/views/comments/index.html.erb
@@ -27,6 +27,8 @@
           <td><%= comment.text %></td>
           <% if !comment.user %>
              <td> <%= 'User undefined' %> </td>
+          <% elsif @exercise.user == current_user %>
+              <td><%= 'yourself' %></td>
           <% elsif comment.user.first_name.nil? || current_user.role === 'user'%>
               <td><%=  "User#{comment.user.id}"%></td>
           <% else %>
diff --git a/app/views/exercises/exercises_all.html.erb b/app/views/exercises/exercises_all.html.erb
index 59e43ae9c..7d292df3f 100644
--- a/app/views/exercises/exercises_all.html.erb
+++ b/app/views/exercises/exercises_all.html.erb
@@ -17,6 +17,8 @@
         <td><%= link_to exercise.title, exercise %></td>
         <% if !exercise.user %>
             <td> <%= 'User undefined' %> </td>
+        <% elsif @exercise.user == current_user %>
+            <td><%= 'yourself' %></td>
         <% elsif exercise.user.first_name.nil?%>
             <td><%= link_to "User#{exercise.user.id}", user_path(exercise.user)%></td>
         <% else %>
diff --git a/app/views/exercises/show.html.erb b/app/views/exercises/show.html.erb
index c90e2c91d..27d718730 100644
--- a/app/views/exercises/show.html.erb
+++ b/app/views/exercises/show.html.erb
@@ -16,6 +16,8 @@
   <dt><%= 'Created by' %>:</dt>
   <% if !@exercise.user %>
       <dd><%= 'User undefined' %></dd>
+  <% elsif @exercise.user == current_user %>
+      <dd><%= 'yourself' %></dd>
   <% elsif @exercise.user.first_name.nil? || current_user.role === 'user'%>
       <dd><%= "User#{@exercise.user.id}"%></dd>
   <% else %>