diff --git a/app/Lib/lang.php b/app/Lib/lang.php
index db70420bd..a9e5f0e20 100644
--- a/app/Lib/lang.php
+++ b/app/Lib/lang.php
@@ -1731,7 +1731,7 @@
   'fd.tc.agree.impl' => 'By clicking <i>Submit</i>, you are agreeing to the following Terms and Conditions.<br />Please review the T&C before continuing.',
   'fd.tc.agree.login' => 'You must agree to all of the following Terms and Conditions before continuing.',
   'fd.tc.agree.no' => 'Not Agreed',
-  'fd.tc.agree.yes' => 'Agreed',
+  'fd.tc.agree.yes' => 'Agreed (%1$s, %2$s)',
   'fd.tc.archived' => 'The definition of this T&C changed after the agreement was recorded',
   'fd.tc.body' => 'Inline T&C',
   'fd.tc.body.desc' => 'Terms and Conditions for inline rendering. If provided, overrides and overwrites the URL',
diff --git a/app/Model/CoTermsAndConditions.php b/app/Model/CoTermsAndConditions.php
index 636bb7813..f72356c9e 100644
--- a/app/Model/CoTermsAndConditions.php
+++ b/app/Model/CoTermsAndConditions.php
@@ -166,13 +166,13 @@ public function status($copersonid) {
         if($a['CoTermsAndConditions']['id'] == $tid) {
           // Agreement is to the current T&C
           $tandc[$i]['CoTAndCAgreement'] = $a['CoTAndCAgreement'];
+          $tandc[$i]['CoTermsAndConditions'] = $a['CoTermsAndConditions'];
           break;
         } elseif($a['CoTermsAndConditions']['co_terms_and_conditions_id'] == $tid) {
           // Agreement is to a previous version of the current T&C,
-          // which for now at least is considered sufficient
           $tandc[$i]['CoTAndCAgreement'] = $a['CoTAndCAgreement'];
-          // Replace with the version actually agreed to
-          $tandc[$i]['CoTermsAndConditions'] = $a['CoTermsAndConditions'];
+          // Store the currentCoTermsAndConditions
+          $tandc[$i]['CurrentCoTermsandConditions'] = $tandc[$i]['CoTermsAndConditions'];
           break;
         }
       }
diff --git a/app/View/CoTermsAndConditions/review.ctp b/app/View/CoTermsAndConditions/review.ctp
index cb027fd7a..876de8a86 100644
--- a/app/View/CoTermsAndConditions/review.ctp
+++ b/app/View/CoTermsAndConditions/review.ctp
@@ -120,14 +120,12 @@
         <td>
           <?php
             if(!empty($c['CoTAndCAgreement'])) {
-              print _txt('fd.tc.agree.yes')
-                    . " ("
-                    . $c['CoTAndCAgreement']['identifier']
-                    . ", "
-                    . $this->Time->format($c['CoTAndCAgreement']['agreement_time'], "%c $vv_tz", false, $vv_tz)
-                    . ")";
+              print _txt('fd.tc.agree.yes', array(
+                $c['CoTAndCAgreement']['identifier'],
+                $this->Time->format($c['CoTAndCAgreement']['agreement_time'], "%c $vv_tz", false, $vv_tz)
+              ));
 
-              if(!empty($c['CoTermsAndConditions']['co_terms_and_conditions_id'])) {
+              if(!empty($c['CurrentCoTermsandConditions'])) {
                 print "</br>" . _txt('fd.tc.archived');
               }
             } else {
@@ -136,7 +134,7 @@
           ?>
         </td>
         <td>
-          <?php if(!empty($c['CoTAndCAgreement'])): ?>
+          <?php if(!empty($c['CoTAndCAgreement']) && empty($c['CurrentCoTermsandConditions'])): ?>
           <button class="checkbutton"
                   type="button"
                   onClick="open_tandc('<?php print addslashes($c['CoTermsAndConditions']['description']); ?>',
@@ -148,14 +146,14 @@
           <?php else: ?>
           <button class="checkbutton"
                   type="button"
-                  onClick="open_tandc('<?php print addslashes($c['CoTermsAndConditions']['description']); ?>',
-                                      '<?php print addslashes($c['CoTermsAndConditions']['url']); ?>',
+                  onClick="open_tandc('<?php print addslashes(empty($c['CurrentCoTermsandConditions']) ? $c['CoTermsAndConditions']['description'] : $c['CurrentCoTermsandConditions']['description']); ?>',
+                                      '<?php print addslashes(empty($c['CurrentCoTermsandConditions']) ? $c['CoTermsAndConditions']['url'] : $c['CurrentCoTermsandConditions']['url']); ?>',
                                       'agree',
                                       '<?php
                                           $args = array(
                                             'controller' => 'co_terms_and_conditions',
                                             'action' => 'agree',
-                                            $c['CoTermsAndConditions']['id'],
+                                            (empty($c['CurrentCoTermsandConditions']) ? $c['CoTermsAndConditions']['id'] : $c['CurrentCoTermsandConditions']['id']),
                                             'copersonid' => $vv_co_person['CoPerson']['id']
                                           );