diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 2e8a207ae..01a039753 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -19,6 +19,10 @@ Andreas Graf).
  - Bugfix [ 914217 ] content managers cannot turn admin on
  - Bugfix [ 920089 ] Problem with clipboard and object names containing a
    quote.
+ - Bugfix [ 921750 ] Error in Horizontal Login Box template (Thanks to Tony
+   Mountifield.)
+ - Added Tony Mountifield to the credits list for all his debugging efforts as
+   of late.
 
 
 6.0.0
diff --git a/docs/credits.txt b/docs/credits.txt
index 2eb879568..fb5410f92 100644
--- a/docs/credits.txt
+++ b/docs/credits.txt
@@ -29,6 +29,7 @@ Contributing Developers..............Peter Beardsley / Appropriate Solutions
                                      John W. Krahn
                                      Len Kranendonk
                                      Christophe Marcant
+                                     Tony Mountifield
                                      Tavis Parker / ParkerOne Consulting
                                      Daniel Quinlan
                                      Alan Ritari / DonorWare
diff --git a/docs/upgrades/upgrade_6.0.0-6.0.1.sql b/docs/upgrades/upgrade_6.0.0-6.0.1.sql
index 02d44fb10..1f537751c 100644
--- a/docs/upgrades/upgrade_6.0.0-6.0.1.sql
+++ b/docs/upgrades/upgrade_6.0.0-6.0.1.sql
@@ -80,4 +80,7 @@ INSERT INTO international VALUES (1096,'WebGUI',1,'Navigation Template',10782079
 INSERT INTO international VALUES (1097,'WebGUI',1,'<STRONG>config.button</STRONG>&nbsp;<BR>A \"Edit / Manage\" button for this navigation item.<BR>\r\n<P><STRONG>page_loop</STRONG><BR>A loop containing page information.</P>\r\n<BLOCKQUOTE dir=ltr style=\"MARGIN-RIGHT: 0px\">\r\n<P dir=ltr><STRONG>page.menuTitle<BR></STRONG>The menu title of this page.</P>\r\n<P dir=ltr><STRONG>page.title<BR></STRONG>The title of this page.</P>\r\n<P><STRONG>page.urlizedTitle<BR></STRONG>The urlized title of this pagepage.url.</P>\r\n<P><STRONG>page.url<BR></STRONG>The url of this page.</P>\r\n<P dir=ltr><STRONG>page.pageId</STRONG><BR>The pageId of this page.</P>\r\n<P dir=ltr><STRONG>page.parentId</STRONG><BR>The ParentId&nbsp;of this page.</P>\r\n<P dir=ltr><STRONG>page.ownerId<BR></STRONG>The ownerId of this page.</P>\r\n<P dir=ltr><STRONG>page.synopsis<BR></STRONG>The synopsis of this page.</P>\r\n<P dir=ltr><STRONG>page.newWindow</STRONG><BR>A condition indicating whether this page should be opened in a new window.</P>\r\n<P dir=ltr><STRONG>page.absDepth</STRONG><BR>The absolute depth of this page&nbsp;(relative to nameless root).</P>\r\n<P><STRONG>page.relDepth</STRONG><BR>The relative depth of this page (relative to starting point).</P>\r\n<P><STRONG>page.isCurrent</STRONG><BR>A condition indicating whether this page is current page.</P>\r\n<P><STRONG>page.isHidden</STRONG><BR>A condition indicating whether this page is a hidden page.<BR><EM>(Note: This variable is only visible if \"Show hidden pages\" is switched on.)</EM></P>\r\n<P><STRONG>page.isSystem</STRONG><BR>A condition indicating whether this page is a system page (Trash, Clipboard, etc).<BR><EM>(Note: This variable is only visible if \"Show system pages\" is switched on.)</EM></P>\r\n<P><STRONG>page.isViewable<BR></STRONG>A condition indicating whether the user has permission to view it.<BR><EM>(Note: This variable is only visible if \"Show unprivileged pages\" is switched on.)</EM></P>\r\n<P><STRONG>page.indent<BR></STRONG>A variable containing the indent for current page. The default indent is three spaces. Use the <STRONG>page.indent_loop </STRONG>if you need a more flexible indent.</P>\r\n<P><STRONG>page.indent_loop<BR></STRONG>A loop that runs <STRONG>page.relDepth </STRONG>times.</P>\r\n<BLOCKQUOTE dir=ltr style=\"MARGIN-RIGHT: 0px\">\r\n<P><STRONG>indent</STRONG><BR>A number representing the loop count. </P></BLOCKQUOTE>\r\n<P dir=ltr><STRONG>page.isRoot</STRONG><BR>A condition indication whether this page is a root page.</P>\r\n<P dir=ltr><STRONG>page.isTop</STRONG><BR>A condition indication whether this page is a top page (daughter of root).</P>\r\n<P dir=ltr><STRONG>page.hasDaughter</STRONG><BR>A condition indication whether this page has a daughter. In other words: It evaluates to true if this page is a mother.</P>\r\n<P dir=ltr><STRONG>page.isMyDaughter</STRONG><BR>A condition indication whether this page is a daughter of current page.</P>\r\n<P dir=ltr><STRONG>page.isMyMother<BR></STRONG>A condition indication whether this page is the mother of current page.</P>\r\n<P dir=ltr><STRONG>page.mother.title<BR></STRONG>The title of the mother of this&nbsp;page.</P>\r\n<P dir=ltr><STRONG>page.mother.urlizedTitle<BR></STRONG>The urlized title of the mother of this page.</P>\r\n<P dir=ltr><STRONG>page.mother.pageId</STRONG><BR>The pageId of the mother of this page.</P>\r\n<P dir=ltr><STRONG>page.mother.parentId</STRONG><BR>The parentId of the mother of this page.</P>\r\n<P dir=ltr><STRONG>page.depthIs1 , page.depthIs2 , page.depthIs3 , page.depthIs4 , page.depthIsN<BR></STRONG>A condition indicating whether the depth of this page is N. This variable is useful if you want to style a certain level.</P>\r\n<P dir=ltr>&lt;tmpl_if page.depthIs1&gt;<BR>&nbsp;&nbsp; &lt;img src=\"level1.gif\"&gt;<BR>&lt;tmpl_else&gt;<BR>&nbsp;&nbsp; &lt;img src=\"defaultBullet.gif\"&gt;<BR>&lt;/tmpl_if&gt;</P>\r\n<P dir=ltr><STRONG>page.relativeDepthIs1 , page.relativeDepthIs2 , page.relativeDepthIs3 , page.relativeDepthIsN</STRONG><BR>A condition indicating whether the relative depth of this page is N.</P></BLOCKQUOTE>\r\n<P dir=ltr>&nbsp;</P>',1078207966,NULL);
 update Navigation set depth=99 where depth=0;
 delete from international where internationalId=981 and namespace='WebGUI';
+delete from template where namespace='Macro/L_loginBox' and templateId=2;
+INSERT INTO template VALUES (2,'Horizontal Login Box','<div class=\"loginBox\">\n<tmpl_if user.isVisitor>\n	<tmpl_var form.header>\n	<table border=\"0\" class=\"loginBox\" cellpadding=\"1\" cellspacing=\"0\">\n	<tr>\n		<td><tmpl_var username.form></td>\n		<td><tmpl_var password.form></td>\n		<td><tmpl_var form.login></td>\n	</tr>\n	<tr>\n		<td><tmpl_var username.label></td>\n		<td><tmpl_var password.label></td>\n		<td></td>\n	</tr>\n	</table>             	<tmpl_if session.setting.anonymousRegistration>\n                        <a href=\"<tmpl_var account.create.url>\"><tmpl_var account.create.label></a>\n	</tmpl_if>		<tmpl_var form.footer> \n<tmpl_else>\n	<tmpl_unless customText>\n		<tmpl_var hello.label> <a href=\"<tmpl_var account.display.url>\"><tmpl_var session.user.username></a>.\n                          <tmpl_var logout.label><br />\n	<tmpl_else>\n		<tmpl_var customText>\n	</tmpl_unless>\n</tmpl_if>\n</div>\n','Macro/L_loginBox',1,1);
+