diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index a3fe012693..45aec07631 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -719,7 +719,11 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			<legend>Patron Account Flags</legend>
 			<ol class="radio">
 			<!-- TMPL_LOOP NAME="flagloop" -->
-				<li><label class="radio" for="yes<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="html" -->: </label>
+				<li><label class="radio" for="yes<!-- TMPL_VAR name="name" -->">
+				<!-- TMPL_IF EXPR="key eq 'gonenoaddress'" -->Gone no Address:<!-- /TMPL_IF -->
+				<!-- TMPL_IF EXPR="key eq 'debarred'" -->Debarred:<!-- /TMPL_IF -->
+				<!-- TMPL_IF EXPR="key eq 'lost'" -->Lost Card:<!-- /TMPL_IF -->
+                </label>
 				
 				<label for="yes<!-- TMPL_VAR NAME="name" -->">Yes </label>
 				<!-- TMPL_IF NAME="yes" -->
diff --git a/members/memberentry.pl b/members/memberentry.pl
index f23dca512a..090342c889 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -364,26 +364,27 @@ while (@relationships) {
   }
   push(@relshipdata, \%row);
 }
-my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Gone no address '],
-        'lost'          => ['lost', 'Lost'],
-        'debarred'      => ['debarred', 'Debarred']);
 
+my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],
+        'lost'          => ['lost'],
+        'debarred'      => ['debarred']);
+
+ 
 my @flagdata;
 foreach (keys(%flags)) {
-my $key = $_;
-my %row =  ('key'   => $key,
-    'name'  => $flags{$key}[0],
-    'html'  => $flags{$key}[1]);
-if ($data{$key}) {
-  $row{'yes'}=' checked';
-  $row{'no'}='';
-} else {
-  $row{'yes'}='';
-  $row{'no'}=' checked';
+	my $key = $_;
+	my %row =  ('key'   => $key,
+		    'name'  => $flags{$key}[0]);
+	if ($data{$key}) {
+		$row{'yes'}=' checked';
+		$row{'no'}='';
+    }
+	else {
+		$row{'yes'}='';
+		$row{'no'}=' checked';
+	}
+	push @flagdata,\%row;
 }
-push(@flagdata, \%row);
-}
-
 
 #get Branches
 my @branches;