diff --git a/postgresql/edit_user.cgi b/postgresql/edit_user.cgi
index 4c14c7971..c39e0f098 100755
--- a/postgresql/edit_user.cgi
+++ b/postgresql/edit_user.cgi
@@ -60,13 +60,13 @@ printf "<input type=radio name=other value=0 %s> $text{'no'}</td> </tr>\n",
 	$user[4] =~ /t|1/ ? '' : 'checked';
 
 print "<tr> <td><b>$text{'user_until'}</b></td> <td colspan=3>\n";
-if (!$user[7]) {
+if (!$user[6]) {
 	printf "<input type=radio name=until_def value=1 %s> %s\n",
-		$user[7] ? '' : 'checked', $text{'user_forever'};
+		$user[6] ? '' : 'checked', $text{'user_forever'};
 	printf "<input type=radio name=until_def value=0 %s>\n",
-		$user[7] ? 'checked' : '';
+		$user[6] ? 'checked' : '';
 	}
-print "<input name=until size=30 value='$user[7]'></td> </tr>\n";
+print "<input name=until size=30 value='$user[6]'></td> </tr>\n";
 
 print "</table></td></tr></table>\n";
 print "<table width=100%><tr>\n";
diff --git a/postgresql/list_users.cgi b/postgresql/list_users.cgi
index f188efa2e..ac899d82f 100755
--- a/postgresql/list_users.cgi
+++ b/postgresql/list_users.cgi
@@ -24,7 +24,7 @@ foreach $u (sort { $a->[0] cmp $b->[0] } @{$s->{'data'}}) {
 	push(@cols, $u->[5] ? $text{'yes'} : $text{'no'});
 	push(@cols, $u->[2] =~ /t|1/ ? $text{'yes'} : $text{'no'});
 	push(@cols, $u->[4] =~ /t|1/ ? $text{'yes'} : $text{'no'});
-	push(@cols, $u->[7] ? &html_escape($u->[7])
+	push(@cols, $u->[6] ? &html_escape($u->[6])
 			     : $text{'user_forever'});
 	print &ui_checked_columns_row(\@cols, undef, "d", $u->[0]);
 	}