diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 84019688b4..6bfe8d4bd9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -652,13 +652,31 @@ $(document).ready(function() {
                                     <li>
                                         <label for="subtype">Subscription length:</label>
                                         <select name="subtype" id="subtype">
-                                            [% FOREACH subt IN subtype %]
-                                                [% IF (subt.selected) %]
-                                                    <option value="[% subt.name %]" selected="selected">
-                                                [% ELSE %]
-                                                    <option value="[% subt.name %]">
+                                            [% FOREACH st IN subtypes %]
+                                                [% SWITCH st %]
+                                                    [% CASE 'numberlength' %]
+                                                        [% IF st == subtype %]
+                                                            <option value="issues" selected="selected">
+                                                        [% ELSE %]
+                                                            <option value="issues">
+                                                        [% END %]
+                                                        issues
+                                                    [% CASE 'weeklength' %]
+                                                        [% IF st == subtype %]
+                                                            <option value="weeks" selected="selected">
+                                                        [% ELSE %]
+                                                            <option value="weeks">
+                                                        [% END %]
+                                                        weeks
+                                                    [% CASE 'monthlength' %]
+                                                        [% IF st == subtype %]
+                                                            <option value="months" selected="selected">
+                                                        [% ELSE %]
+                                                            <option value="months">
+                                                        [% END %]
+                                                        months
+                                                    [% CASE %][% st %]
                                                 [% END %]
-                                                    [% subt.name %]
                                                 </option>
                                             [% END %]
                                         </select>
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 39d79b7365..ce6f91dd3b 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -59,8 +59,6 @@ my ($template, $loggedinuser, $cookie)
 
 
 my $sub_on;
-my @subscription_types = (qw(issues weeks months));
-my @sub_type_data;
 
 my $subs;
 our $firstissuedate;
@@ -164,17 +162,11 @@ if ($op eq 'addsubscription') {
 } elsif ($op eq 'modsubscription') {
     redirect_mod_subscription();
 } else {
-        while (@subscription_types) {
-           my $sub_type = shift @subscription_types;
-           my %row = ( 'name' => $sub_type );
-           if ( defined $sub_on and $sub_on eq $sub_type ) {
-	     $row{'selected'} = ' selected';
-           } else {
-	     $row{'selected'} = '';
-           }
-           push( @sub_type_data, \%row );
-        }
-    $template->param(subtype => \@sub_type_data);
+
+    $template->param(
+        subtypes => [ qw( numberlength weeklength monthlength ) ],
+        subtype => $sub_on,
+    );
 
     if ( $op ne 'modsubscription' && $op ne 'dup' && $op ne 'modify' ) {
         my $letters = get_letter_loop();