diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html
index 4ac03eb5ca..3645f5147e 100644
--- a/phpBB/styles/prosilver/template/ucp_agreement.html
+++ b/phpBB/styles/prosilver/template/ucp_agreement.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <script type="text/javascript" defer="defer" >
-// <![CDATA[	
+// <![CDATA[
 	function disable(disabl, name)
 	{
 		document.getElementById(name).disabled = disabl;
@@ -14,10 +14,10 @@
 			document.getElementById(name).className = 'button1 enabled';
 		}
 	}
-	
+
 	<!-- IF S_TIME -->
 		onload_functions.push('disable(true, "agreed")');
-		setTimeout('disable(false, "agreed")', {S_TIME});
+		setInterval('disable(false, "agreed")', {S_TIME});
 	<!-- ENDIF -->
 // ]]>
 </script>
@@ -41,7 +41,7 @@
 			<!-- IF S_SHOW_COPPA -->
 			<strong><a href="{U_COPPA_NO}" class="button1">{L_COPPA_NO}</a></strong>&nbsp; <a href="{U_COPPA_YES}" class="button2">{L_COPPA_YES}</a>
 			<!-- ELSE -->
-			<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" />&nbsp; 
+			<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" />&nbsp;
 			<input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button2" />
 			<!-- ENDIF -->
 		</fieldset>
@@ -51,7 +51,7 @@
 	{S_HIDDEN_FIELDS}
 	{S_FORM_TOKEN}
 	</form>
-	
+
 <!-- ELSEIF S_AGREEMENT -->
 
 	<div class="panel">
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index c8af288885..8fd722e241 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -10,7 +10,7 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit.click();
 	}
-	
+
 	function disable(disabl, name)
 	{
 		document.getElementById(name).disabled = disabl;
@@ -23,12 +23,12 @@
 			document.getElementById(name).className = 'button1 enabled';
 		}
 	}
-	
+
 	<!-- IF S_TIME -->
 		onload_functions.push('disable(true, "submit")');
-		setTimeout('disable(false, "submit")', {S_TIME});
+		setInterval('disable(false, "submit")', {S_TIME});
 	<!-- ENDIF -->
-	
+
 // ]]>
 </script>
 
@@ -68,9 +68,9 @@
 		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
 		<dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
 	</dl>
-	
+
 	<hr />
-	
+
 	<dl>
 		<dt><label for="lang">{L_LANGUAGE}:</label></dt>
 		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
@@ -130,7 +130,7 @@
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 		<input type="submit" name="submit" id ="submit" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
 
diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html
index 04d978c70e..c02ebe18e6 100644
--- a/phpBB/styles/subsilver2/template/ucp_agreement.html
+++ b/phpBB/styles/subsilver2/template/ucp_agreement.html
@@ -4,12 +4,12 @@
 // <![CDATA[
 
 	var old_func = window.onload;
-	
+
 	function disable(disabl)
 	{
 		document.getElementById("agreed").disabled = disabl;
 	}
-	
+
 	function disable_and_handle()
 	{
 		if (old_func)
@@ -18,18 +18,18 @@
 		}
 		disable(true);
 	}
-	
-	<!-- IF S_TIME -->		
+
+	<!-- IF S_TIME -->
 		window.onload = disable_and_handle;
-		setTimeout("disable(false)", {S_TIME});	
+		setInterval("disable(false)", {S_TIME});
 	<!-- ENDIF -->
 // ]]>
 </script>
 
 <!-- IF S_SHOW_COPPA or S_REGISTRATION -->
-	
+
 	<form method="post" action="{S_UCP_ACTION}">
-	
+
 	<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<th height="25">{SITENAME} - {L_REGISTRATION}</th>
@@ -57,7 +57,7 @@
 	{S_HIDDEN_FIELDS}
 	{S_FORM_TOKEN}
 	</form>
-	
+
 <!-- ELSEIF S_AGREEMENT -->
 
 	<table class="tablebg" width="100%" cellspacing="1">
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index 159c663915..6a5adb8be8 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -10,14 +10,14 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit.click();
 	}
-	
+
 	var old_func = window.onload;
-	
+
 	function disable(disabl)
 	{
 		document.getElementById("submit").disabled = disabl;
 	}
-	
+
 	function disable_and_handle()
 	{
 		if (old_func)
@@ -26,10 +26,10 @@
 		}
 		disable(true);
 	}
-	
-	<!-- IF S_TIME -->		
+
+	<!-- IF S_TIME -->
 		window.onload = disable_and_handle;
-		setTimeout("disable(false)", {S_TIME});	
+		setInterval("disable(false)", {S_TIME});
 	<!-- ENDIF -->
 // ]]>
 </script>
@@ -48,12 +48,12 @@
 <!-- ENDIF -->
 
 <!-- IF L_REG_COND -->
-	<tr> 
+	<tr>
 		<td class="row2" colspan="2"><span class="gensmall">{L_REG_COND}</span></td>
 	</tr>
 <!-- ENDIF -->
 <!-- IF .profile_fields -->
-	<tr> 
+	<tr>
 		<td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
 	</tr>
 <!-- ENDIF -->