diff --git a/classes/Confirm_email.php b/classes/Confirm_address.php
similarity index 64%
rename from classes/Confirm_email.php
rename to classes/Confirm_address.php
index 0b13a46690..f0c354babb 100644
--- a/classes/Confirm_email.php
+++ b/classes/Confirm_address.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * Table Definition for confirm_email
+ * Table Definition for confirm_address
  */
 require_once 'DB/DataObject.php';
 
-class Confirm_email extends DB_DataObject 
+class Confirm_address extends DB_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
-    public $__table = 'confirm_email';                   // table name
+    public $__table = 'confirm_address';                 // table name
     public $code;                            // varchar(32)  primary_key not_null
     public $user_id;                         // int(4)   not_null
-    public $email;                           // varchar(255)   not_null
+    public $address;                         // varchar(255)   not_null
+    public $address_type;                    // varchar(32)   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Confirm_email',$k,$v); }
+    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Confirm_address',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
diff --git a/classes/User.php b/classes/User.php
index 4fb6892ea4..78815a72ea 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,6 +34,8 @@ class User extends DB_DataObject
     public $nickname;                        // varchar(64)  unique_key
     public $password;                        // varchar(255)  
     public $email;                           // varchar(255)  unique_key
+    public $jabber;                          // varchar(255)  unique_key
+    public $sms;                             // varchar(64)  unique_key
     public $uri;                             // varchar(255)  unique_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
diff --git a/classes/stoica.ini b/classes/stoica.ini
index 3745697d52..d5f758c8c5 100644
--- a/classes/stoica.ini
+++ b/classes/stoica.ini
@@ -16,13 +16,14 @@ width = K
 height = K
 url = U
 
-[confirm_email]
+[confirm_address]
 code = 130
 user_id = 129
-email = 130
+address = 130
+address_type = 130
 modified = 384
 
-[confirm_email__keys]
+[confirm_address__keys]
 code = K
 
 [consumer]
@@ -115,6 +116,8 @@ id = 129
 nickname = 2
 password = 2
 email = 2
+jabber = 2
+sms = 2
 uri = 2
 created = 142
 modified = 384
@@ -123,6 +126,8 @@ modified = 384
 id = K
 nickname = U
 email = U
+jabber = U
+sms = U
 uri = U
 
 [user_openid]