diff --git a/TopicUserMappingContrib/data/System/BulkRegistrationInputTemplate.txt b/TopicUserMappingContrib/data/System/BulkRegistrationInputTemplate.txt
new file mode 100644
index 0000000000..1b9f10c26b
--- /dev/null
+++ b/TopicUserMappingContrib/data/System/BulkRegistrationInputTemplate.txt
@@ -0,0 +1,13 @@
+%META:TOPICINFO{author="ProjectContributor" date="1456871285" format="1.1" version="1"}%
+%META:TOPICPARENT{name="WikiUsers"}%
+---+ <nop>%TOPIC%
+
+<noautolink>
+%EDITTABLE{ headerrows="1" }%%STARTSECTION{type="expandvariables"}%
+| *WikiName* |%IF{"{Register}{AllowLoginName}" then=" *LoginName* |"}% *Email* | *Password* | *AddToGroups* |\
+ *%CALCULATE{"$LISTJOIN(* | *, $LISTIF($NOT($EXACT($item,Email)),%QUERY{"'%URLPARAM{"usertemplate" default="%SYSTEMWEB%.NewUserTemplate"}%'/fields.name"}%))"}%* |
+%ENDSECTION%
+</noautolink>
+
+%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="AdminGroup"}%
+%META:PREFERENCE{name="VIEW_TEMPLATE" title="VIEW_TEMPLATE" type="Set" value="System.BulkRegistrationInputView"}%
diff --git a/TopicUserMappingContrib/data/System/BulkRegistrationInputViewTemplate.txt b/TopicUserMappingContrib/data/System/BulkRegistrationInputViewTemplate.txt
index 57ad5987bd..ba86308ebb 100644
--- a/TopicUserMappingContrib/data/System/BulkRegistrationInputViewTemplate.txt
+++ b/TopicUserMappingContrib/data/System/BulkRegistrationInputViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1456797140" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1456871285" format="1.1" version="1"}%
 %META:TOPICPARENT{name="BulkRegister"}%
 %{<verbatim class="tml">
 ===================================================
@@ -30,7 +30,7 @@ Overwrite home topics? <input type='checkbox' class='foswikiInputField' name='Ov
 else="<div class='foswikiAlert'> *Bulk registration is restricted to Administrators.* </div>"}%
 
 %TEXT%
-%INCLUDE{"%TOPIC%Log"}%
+%INCLUDE{"%TOPIC%Log" warn="off"}%
 
 *Back to:* [[%SYSTEMWEB%.BulkRegistration][Bulk Registration]]
 ----
diff --git a/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/MANIFEST b/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/MANIFEST
index 0a8babec6a..898484c437 100644
--- a/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/MANIFEST
+++ b/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/MANIFEST
@@ -12,6 +12,7 @@ data/Main/UserListByDateJoined.txt 0644
 data/Main/UserListByLocation.txt 0644
 data/Main/UserListHeader.txt 0644
 data/System/BulkRegistration.txt 0644
+data/System/BulkRegistrationInputTemplate.txt 0644
 data/System/BulkRegistrationInputViewTemplate.txt 0644
 data/System/BulkResetPassword.txt 0644
 data/System/ChangeEmailAddress.txt 0644