diff --git a/Config/Schema/schema.php b/Config/Schema/schema.php
index fd3691150..0653c4614 100644
--- a/Config/Schema/schema.php
+++ b/Config/Schema/schema.php
@@ -24,7 +24,7 @@ function before($event = array()) {
 	function after($event = array()) {
 	}
 
-	var $details = array(
+	var $user_details = array(
 		'id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36, 'key' => 'primary'),
 		'user_id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36),
 		'position' => array('type' => 'float', 'null' => false, 'default' => '1'),
@@ -44,9 +44,9 @@ function after($event = array()) {
 		'password' => array('type' => 'string', 'null' => true, 'default' => NULL, 'length' => 128),
 		'password_token' => array('type' => 'string', 'null' => true, 'default' => NULL, 'length' => 128),
 		'email' => array('type' => 'string', 'null' => true, 'default' => NULL, 'key' => 'index'),
-		'email_authenticated' => array('type' => 'boolean', 'null' => true, 'default' => '0'),
+		'email_verified' => array('type' => 'boolean', 'null' => true, 'default' => '0'),
 		'email_token' => array('type' => 'string', 'null' => true, 'default' => NULL),
-		'email_token_expires' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
+		'email_token_expiry' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
 		'tos' => array('type' => 'boolean', 'null' => true, 'default' => '0'),
 		'active' => array('type' => 'boolean', 'null' => true, 'default' => '0'),
 		'last_login' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
diff --git a/View/Users/index.ctp b/View/Users/index.ctp
index 1b2ef76e6..fa0d4706c 100644
--- a/View/Users/index.ctp
+++ b/View/Users/index.ctp
@@ -56,6 +56,6 @@
 </div>
 <div class="actions">
 	<ul>
-		<li><?php echo $this->Html->link(__d('users', 'Register an account'), array('action' => 'register')); ?></li>
+		<li><?php echo $this->Html->link(__d('users', 'Register an account'), array('action' => 'add')); ?></li>
 	</ul>
 </div>