diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index b4a337f0c8..8fb30c16ec 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -200,21 +200,19 @@
                                                 </td>
                                                 [% IF ( OpacRenewalAllowed ) %]
                                                     <td class="renew">
-                                                        [% IF ( ISSUE.status ) %]
-                                                            [% IF ( canrenew ) %]
-                                                                <input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>
-                                                            [% END %]
-                                                            <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
-                                                        [% ELSE %]
-                                                            Not renewable
-                                                                [% IF ( ISSUE.too_many ) %]
-                                                                    <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
-                                                                [% ELSE %]
-                                                                    [% IF ( ISSUE.on_reserve ) %]
-                                                                        <span class="renewals">(On hold)</span>
-                                                                    [% END %]
-                                                                [% END %]
+                                                    [% IF ( ISSUE.status ) %]
+                                                        [% IF ( canrenew ) %]
+                                                            <input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>
                                                         [% END %]
+                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
+                                                    [% ELSIF ( ISSUE.too_many ) %]
+                                                        Not renewable
+                                                    [% ELSIF ( ISSUE.too_soon ) %]
+                                                        No renewal before [% ISSUE.soonestrenewdate %]
+                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
+                                                    [% ELSIF ( ISSUE.on_reserve ) %]
+                                                        <span class="renewals">(On hold)</span>
+                                                    [% END %]
                                                     </td>
                                                 [% END %]
                                                 [% IF ( OPACFinesTab ) %]
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 02002a3bef..7ca64bdd37 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -182,8 +182,21 @@ if ($issues){
         if($status && C4::Context->preference("OpacRenewalAllowed")){
             $issue->{'status'} = $status;
         }
-        $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
-        $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
+
+        if ($renewerror) {
+            $issue->{'too_many'}   = 1 if $renewerror eq 'too_many';
+            $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve';
+
+            if ( $renewerror eq 'too_soon' ) {
+                $issue->{'too_soon'}         = 1;
+                $issue->{'soonestrenewdate'} = output_pref(
+                    C4::Circulation::GetSoonestRenewDate(
+                        $issue->{borrowernumber},
+                        $issue->{itemnumber}
+                    )
+                );
+            }
+        }
 
         if ( $issue->{'overdue'} ) {
             push @overdues, $issue;