diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 38d784f529..24baefeac7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -130,10 +130,14 @@ $(document).ready(function() { calcNewsuggTotal(); });
     <fieldset class="rows"> <legend>Suggestion management</legend>
        <ol>
             [% IF ( suggestionid ) %]<li><label for="status">Status:</label><select id="STATUS" name="STATUS"><option value="">No Status</option>
-                <option value="ASKED"[% IF ( statusselected_ASKED ) %] selected="selected"[% END %]>Asked</option>
-                <option value="ACCEPTED"[% IF ( statusselected_ACCEPTED ) %] selected="selected"[% END %]>Accepted</option>
-                <option value="CHECKED"[% IF ( statusselected_CHECKED ) %] selected="selected"[% END %]>Checked</option>
-                <option value="REJECTED"[% IF ( statusselected_REJECTED ) %] selected="selected"[% END %]>Rejected</option>
+                [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Asked</option> 
+                [% ELSE %]<option value="ASKED">Asked</option>[% END %]
+                [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
+                [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
+                [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
+                [% ELSE %]<option value="CHECKED">Checked</option>[% END %]
+                [% IF ( statusselected_REJECTED ) %]<option value="REJECTED" selected="selected">Rejected</option>
+                [% ELSE %]<option value="REJECTED">Rejected</option>[% END %]
             </select></li>[% END %]
         <li><table>
             <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
@@ -273,10 +277,14 @@ $(document).ready(function() { calcNewsuggTotal(); });
         <div id="status[% suggestion.suggestiontype %]">
 	<label for="STATUS[% suggestion.suggestiontype %]">Mark selected as: </label><select name="STATUS" id="STATUS[% suggestion.suggestiontype %]">
 	<option value=""> -- Choose a status --</option>
-	<option value="ASKED"[% IF ( suggestion.statusselected_ASKED ) %] selected="selected"[% END %]>Asked</option>
-	<option value="ACCEPTED"[% IF ( suggestion.statusselected_ACCEPTED ) %] selected="selected"[% END %]>Accepted</option>
-	<option value="CHECKED"[% IF ( suggestion.statusselected_CHECKED ) %] selected="selected"[% END %]>Checked</option>
-	<option value="REJECTED"[% IF ( suggestion.statusselected_REJECTED ) %] selected="selected"[% END %]>Rejected</option>
+    [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Asked</option> 
+    [% ELSE %]<option value="ASKED">Asked</option>[% END %]
+    [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
+    [ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
+    [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
+    [% ELSE %]<option value="CHECKED">Checked</option>[% END %]
+    [% IF ( statusselected_REJECTED ) %]<option value="REJECTED" selected="selected">Rejected</option>
+    [% ELSE %]<option value="REJECTED">Rejected</option>[% END %]
 	</select>
     <label for="reason[% suggestion.suggestiontype %]">with this reason:</label>                 <select id="reason[% suggestion.suggestiontype %]" name="reason[% suggestion.suggestiontype %]">
                     <option value=""> -- Choose a reason -- </option>
@@ -328,12 +336,17 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     <li><label for="collectiontitle"> Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle %]" /></li><li><input type="submit" value="Go" /></li></ol>
                 </fieldset>
 				 <fieldset class="brief"><h4 class="collapse"><a href="#">Suggestion information</a></h4>
-                    <ol><li><label for="status"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
-                    	<option value="ASKED"[% IF ( statusselected_ASKED ) %] selected="selected"[% END %]>Asked</option>
-						<option value="ACCEPTED"[% IF ( statusselected_ACCEPTED ) %] selected="selected"[% END %]>Accepted</option>
-						<option value="CHECKED"[% IF ( statusselected_CHECKED ) %] selected="selected"[% END %]>Checked</option>
-						<option value="REJECTED"[% IF ( statusselected_REJECTED ) %] selected="selected"[% END %]>Rejected</option>
-                                                          </select></li>
+                    <ol>
+                      <li><label for="status"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
+                        [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Asked</option> 
+                        [% ELSE %]<option value="ASKED">Asked</option>[% END %]
+                        [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
+                        [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
+                        [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
+                        [% ELSE %]<option value="CHECKED">Checked</option>[% END %]
+                        [% IF ( statusselected_REJECTED ) %]<option value="REJECTED" selected="selected">Rejected</option>
+                        [% ELSE %]<option value="REJECTED">Rejected</option>[% END %]
+                      </select></li>
                     <li><label for="suggestedby"> Suggested By:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
 [% FOREACH suggestedby_loo IN suggestedby_loop %][% IF ( suggestedby_loo.selected ) %]<option value="[% suggestedby_loo.code %]" selected="selected">[% suggestedby_loo.desc %]</option>[% ELSE %]<option value="[% suggestedby_loo.code %]">[% suggestedby_loo.desc %]</option>[% END %][% END %]
                                                                      </select></li>