diff --git a/acl/save_twofactor.cgi b/acl/save_twofactor.cgi
index fe1da3fe7..6a76fab7a 100755
--- a/acl/save_twofactor.cgi
+++ b/acl/save_twofactor.cgi
@@ -69,11 +69,12 @@ if ($in{'enable'}) {
 		# Show a test form only when enrolling for yourself
 		if ($user->{'name'} eq $base_remote_user) {
 			print &ui_form_start("test_twofactor.cgi");
-			print $text{'twofactor_testdesc'},"<p>\n";
-			print "$text{'twofactor_testfield'}&nbsp;\n",
-				&ui_textbox("test", undef, 12),"\n";
+			print &ui_tag('p', $text{'twofactor_testdesc'});
+			print &ui_tag('p', "$text{'twofactor_testfield'}".
+					   "&nbsp;&nbsp;".
+					   &ui_textbox("test", undef, 12));
 			print &ui_hidden("user", $in{'user'}) if ($in{'user'});
-			print "<p>\n";
+			print &ui_tag('p');
 			print &ui_form_end([ [ undef,
 				$text{'twofactor_test'} ] ]);
 			}