diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 09649ebe68..8a7bc14839 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -43,14 +43,6 @@ class ucp_register
 		$submit			= (isset($_POST['submit'])) ? true : false;
 		$change_lang	= request_var('change_lang', '');
 		$user_lang		= request_var('lang', $user->lang_name);
-
-
-		// not so fast, buddy
-		if (!check_form_key('ucp_register', false, '', false, $config['min_time_reg'])
-			&& !check_form_key('ucp_register_terms', false, '', false, $config['min_time_terms']))
-		{
-			$agreed = false;
-		}
 		
 		if ($agreed)
 		{
@@ -92,7 +84,7 @@ class ucp_register
 
 		$error = $cp_data = $cp_error = array();
 
-		//
+
 		if (!$agreed || ($coppa === false && $config['coppa_enable']) || ($coppa && !$config['coppa_enable']))
 		{
 			$add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : '';
@@ -142,7 +134,6 @@ class ucp_register
 					'S_REGISTRATION'	=> true,
 					'S_HIDDEN_FIELDS'	=> build_hidden_fields($s_hidden_fields),
 					'S_UCP_ACTION'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang . $add_coppa),
-					'S_TIME'			=> 1000 * ((int) $config['min_time_terms']),
 					)
 				);
 			}
@@ -201,7 +192,10 @@ class ucp_register
 				'tz'				=> array('num', false, -14, 14),
 				'lang'				=> array('match', false, '#^[a-z_\-]{2,}$#i'),
 			));
-
+			if (!check_form_key('ucp_register'))
+			{
+				$error[] = $user->lang['FORM_INVALID'];
+			}
 			// Replace "error" strings with their real, localised form
 			$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
 
@@ -544,7 +538,6 @@ class ucp_register
 			'S_COPPA'			=> $coppa,
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 			'S_UCP_ACTION'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
-			'S_TIME'			=> 1000 * ((int) $config['min_time_reg']),
 			)
 		);
 
diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html
index 9aaee00d58..67dcb35e7b 100644
--- a/phpBB/styles/prosilver/template/ucp_agreement.html
+++ b/phpBB/styles/prosilver/template/ucp_agreement.html
@@ -1,26 +1,5 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript" defer="defer" >
-// <![CDATA[
-	function disable(disabl, name)
-	{
-		document.getElementById(name).disabled = disabl;
-		if (disabl)
-		{
-			document.getElementById(name).className = 'button1 disabled';
-		}
-		else
-		{
-			document.getElementById(name).className = 'button1 enabled';
-		}
-	}
-
-	<!-- IF S_TIME -->
-		onload_functions.push('disable(true, "agreed")');
-		setInterval('disable(false, "agreed")', {S_TIME});
-	<!-- ENDIF -->
-// ]]>
-</script>
 
 <!-- IF S_SHOW_COPPA or S_REGISTRATION -->
 
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index 5b5309ce93..721028cef6 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -11,24 +11,6 @@
 		document.forms['register'].submit.click();
 	}
 
-	function disable(disabl, name)
-	{
-		document.getElementById(name).disabled = disabl;
-		if (disabl)
-		{
-			document.getElementById(name).className = 'button1 disabled';
-		}
-		else
-		{
-			document.getElementById(name).className = 'button1 enabled';
-		}
-	}
-
-	<!-- IF S_TIME -->
-		onload_functions.push('disable(true, "submit")');
-		setInterval('disable(false, "submit")', {S_TIME});
-	<!-- ENDIF -->
-
 // ]]>
 </script>
 
diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html
index c02ebe18e6..f1ea9df73a 100644
--- a/phpBB/styles/subsilver2/template/ucp_agreement.html
+++ b/phpBB/styles/subsilver2/template/ucp_agreement.html
@@ -1,30 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript" defer="defer" >
-// <![CDATA[
 
-	var old_func = window.onload;
-
-	function disable(disabl)
-	{
-		document.getElementById("agreed").disabled = disabl;
-	}
-
-	function disable_and_handle()
-	{
-		if (old_func)
-		{
-			old_func();
-		}
-		disable(true);
-	}
-
-	<!-- IF S_TIME -->
-		window.onload = disable_and_handle;
-		setInterval("disable(false)", {S_TIME});
-	<!-- ENDIF -->
-// ]]>
-</script>
 
 <!-- IF S_SHOW_COPPA or S_REGISTRATION -->
 
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index 6a5adb8be8..dac9283b28 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -11,26 +11,6 @@
 		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)
-		{
-			old_func();
-		}
-		disable(true);
-	}
-
-	<!-- IF S_TIME -->
-		window.onload = disable_and_handle;
-		setInterval("disable(false)", {S_TIME});
-	<!-- ENDIF -->
 // ]]>
 </script>