diff --git a/lvm/edit_lv.cgi b/lvm/edit_lv.cgi
index dfe9f9d2a..4bfa112b8 100755
--- a/lvm/edit_lv.cgi
+++ b/lvm/edit_lv.cgi
@@ -359,5 +359,5 @@ if ($in{'lv'} && @pvs > 1 && @pvinfo) {
 	print &ui_form_end([ [ undef, $text{'lv_moveok'} ] ]);
 	}
 
-&ui_print_footer("index.cgi?mode=lvs", $text{'index_return'});
+&ui_print_footer("index.cgi?mode=lvs", $text{'index_return3'});
 
diff --git a/lvm/edit_pv.cgi b/lvm/edit_pv.cgi
index 4c8d4c56f..e7c800efa 100755
--- a/lvm/edit_pv.cgi
+++ b/lvm/edit_pv.cgi
@@ -89,5 +89,5 @@ else {
 	print &ui_form_end([ [ undef, $text{'pv_create2'} ] ]);
 	}
 
-&ui_print_footer("index.cgi?mode=pvs", $text{'index_return'});
+&ui_print_footer("index.cgi?mode=pvs", $text{'index_return2'});
 
diff --git a/lvm/lang/en b/lvm/lang/en
index 059e8fc49..82e27257d 100644
--- a/lvm/lang/en
+++ b/lvm/lang/en
@@ -16,6 +16,8 @@ index_addlv3=Create a thin pool in <tt>$1</tt>.
 index_addlv=Create a new logical volume.
 index_addsnap=Create a new snapshot.
 index_return=volume groups
+index_return2=physical volumes
+index_return3=logical volumes
 index_init=This may be because LVM has not been activated yet. <a href='$1'>Activate it now</a> to view all volume groups.
 index_eversion=Webmin only supports LVM versions 1.0 and above. The output from $1 on your system was : $2
 index_version=LVM version $1
diff --git a/lvm/mkfs.cgi b/lvm/mkfs.cgi
index 3b03da265..84a25d9a2 100755
--- a/lvm/mkfs.cgi
+++ b/lvm/mkfs.cgi
@@ -21,6 +21,6 @@ $config{'lasttype_'.$in{'dev'}} = $in{'fs'};
 &save_module_config();
 &webmin_log("mkfs", "lv", $in{'dev'}, \%in);
 
-&ui_print_footer("index.cgi?mode=lvs", $text{'index_return'},
+&ui_print_footer("index.cgi?mode=lvs", $text{'index_return3'},
 		 "edit_lv.cgi?vg=$in{'vg'}&lv=$in{'lv'}", $text{'lv_return'});
 
diff --git a/lvm/mkfs_form.cgi b/lvm/mkfs_form.cgi
index fe493e8d7..e731884a1 100755
--- a/lvm/mkfs_form.cgi
+++ b/lvm/mkfs_form.cgi
@@ -20,5 +20,5 @@ print &ui_table_start($text{'mkfs_header'}, undef, 4);
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'create'} ] ]);
 
-&ui_print_footer("index.cgi?mode=lvs", $text{'index_return'});
+&ui_print_footer("index.cgi?mode=lvs", $text{'index_return3'});
 
diff --git a/lvm/save_lv.cgi b/lvm/save_lv.cgi
index fcb232655..fcbc5e9b7 100755
--- a/lvm/save_lv.cgi
+++ b/lvm/save_lv.cgi
@@ -48,7 +48,7 @@ elsif ($in{'delete'}) {
 		}
 	print &ui_form_end([ [ 'confirm', $text{'lv_deleteok'} ] ]);
 	print "</center>\n";
-	&ui_print_footer("index.cgi?mode=lvs", $text{'index_return'});
+	&ui_print_footer("index.cgi?mode=lvs", $text{'index_return3'});
 	}
 elsif ($in{'rollback'}) {
 	# Ask the user if he is sure
@@ -61,7 +61,7 @@ elsif ($in{'rollback'}) {
 			"<tt>$lv->{'device'}</tt>"),"</b><p>\n";
 	print &ui_form_end([ [ 'confirm_rollback', $text{'lv_snaprollbackok'} ] ]);
 	print "</center>\n";
-	&ui_print_footer("index.cgi?mode=lvs", $text{'index_return'});
+	&ui_print_footer("index.cgi?mode=lvs", $text{'index_return3'});
 	}
 else {
 	# Validate inputs
@@ -222,7 +222,7 @@ else {
 					print "<b>$err</b> <p>\n";
 					print "<input type=submit name=sizeconfirm value='$text{'resize_ok'}'>\n";
 					print "</form></center>\n";
-					&ui_print_footer("", $text{'index_return'});
+					&ui_print_footer("index.cgi?mode=lvs", $text{'index_return3'});
 					exit;
 					}
 				}
diff --git a/lvm/save_pv.cgi b/lvm/save_pv.cgi
index 879eb8c06..2053fa1f2 100755
--- a/lvm/save_pv.cgi
+++ b/lvm/save_pv.cgi
@@ -32,7 +32,7 @@ elsif ($in{'delete'}) {
 			  "<tt>$pv->{'device'}</tt>"),"</b><p>\n";
 	print &ui_form_end([ [ 'confirm', $text{'pv_deleteok'} ] ]);
 	print "</center>\n";
-	&ui_print_footer("index.cgi?mode=pvs", $text{'index_return'});
+	&ui_print_footer("index.cgi?mode=pvs", $text{'index_return2'});
 	}
 elsif ($in{'resize'}) {
 	# Scale up to match device