diff --git a/opentech/apply/funds/templates/funds/includes/review_table_row.html b/opentech/apply/funds/templates/funds/includes/review_table_row.html
index 18b05f47d4f41642624e0b0f7a62a125b01d2572..1717b7fe71c31cdddef0e56d00e2bb34e692dccb 100644
--- a/opentech/apply/funds/templates/funds/includes/review_table_row.html
+++ b/opentech/apply/funds/templates/funds/includes/review_table_row.html
@@ -6,7 +6,7 @@
             <td>-</td>
         {% else %}
             <td class="reviews-sidebar__author" colspan="2">
-                {% if request.user.is_apply_staff %}
+                {% if request.user.is_apply_staff or request.user == review.author %}
                     <a href="{% url 'apply:submissions:reviews:review' submission_pk=review.submission.id pk=review.id %}">
                         <span>{{ review.author }}</span>
                     </a>
diff --git a/opentech/apply/review/blocks.py b/opentech/apply/review/blocks.py
index 275f1601f2dba8a3ca4a3436b1432f9219abab3d..6398ae8c14f649c4824521d4e2f624928cfb32e7 100644
--- a/opentech/apply/review/blocks.py
+++ b/opentech/apply/review/blocks.py
@@ -22,7 +22,11 @@ class ScoreFieldBlock(OptionalFormFieldBlock):
         template = 'review/render_scored_answer_field.html'
 
     def render(self, value, context=None):
-        comment, score = context['data']
+        try:
+            comment, score = context['data']
+        except ValueError:
+            # TODO: Remove json load as data moved away from JSON
+            comment, score = json.loads(context['data'])
         context.update(**{
             'comment': comment,
             'score': RATE_CHOICES_DICT.get(int(score), RATE_CHOICE_NA)