diff --git a/include/dba.php b/include/dba.php
index 8d224b570..63b75c494 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -233,7 +233,7 @@ function q($sql) {
 	if($db && $db->connected) {
 		$stmt = vsprintf($sql,$args);
 		if($stmt === false)
-			logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+			logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
 		return $db->q($stmt);
 	}
 
diff --git a/include/uimport.php b/include/uimport.php
new file mode 100644
index 000000000..0de665240
--- /dev/null
+++ b/include/uimport.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * import account file exported from mod/uexport
+ * args:
+ *  $a       App     Friendica App Class
+ *  $file   Array   array from $_FILES
+ */
+require_once("include/Photo.php");
+define("IMPORT_DEBUG", False);
+
+function last_insert_id(){
+    global $db; 
+    if (IMPORT_DEBUG) return 1;
+    if($db->mysqli){
+        $thedb = $db->getdb();
+        return $thedb->insert_id;
+    } else {
+        return mysql_insert_id();
+    }
+ }
+ 
+ function last_error(){
+    global $db; 
+    return $db->error;
+ }
+ 
+ function db_import_assoc($table, $arr){
+    if (IMPORT_DEBUG) return true;
+    if (isset($arr['id'])) unset($arr['id']);
+    $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
+    $vals = implode("','", array_map('dbesc', array_values($arr)));
+    $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
+    logger("uimport: $query",LOGGER_TRACE);
+    return q($query);
+ }
+
+function import_cleanup($newuid) {
+    q("DELETE FROM `user` WHERE uid = %d", $newuid);
+    q("DELETE FROM `contact` WHERE uid = %d", $newuid);
+    q("DELETE FROM `profile` WHERE uid = %d", $newuid);
+    q("DELETE FROM `photo` WHERE uid = %d", $newuid);
+    q("DELETE FROM `group` WHERE uid = %d", $newuid);
+    q("DELETE FROM `group_member` WHERE uid = %d", $newuid);
+    q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);
+
+}
+
+function import_account(&$a, $file) {
+    logger("Start user import from ".$file['tmp_name']);
+    /*
+        STEPS
+        1. checks
+        2. replace old baseurl with new baseurl
+        3. import data (look at user id and contacts id)
+        4. archive non-dfrn contacts
+        5. send message to dfrn contacts
+     */
+
+    $account = json_decode(file_get_contents($file['tmp_name']), true);
+    if ($account===null) {
+        notice(t("Error decoding account file"));
+        return;
+    }
+       
+
+    if (!x($account, 'version')) { 
+        notice(t("Error! No version data in file! This is not a Friendica account file?"));
+        return;
+    }
+   
+    if ($account['schema'] != DB_UPDATE_VERSION) {
+        notice(t("Error! I can't import this file: DB schema version is not compatible."));
+        return;
+    }
+   
+
+    $oldbaseurl  = $account['baseurl'];
+    $newbaseurl = $a->get_baseurl();
+    $olduid = $account['user']['uid'];
+  
+    unset($account['user']['uid']);
+    foreach($account['user'] as $k => &$v) {
+        $v = str_replace($oldbaseurl, $newbaseurl, $v);
+    }
+
+    
+    // import user
+    $r = db_import_assoc('user', $account['user']);
+    if ($r===false) {
+        //echo "<pre>"; var_dump($r, $query, mysql_error()); killme();
+        logger("uimport:insert user : ERROR : ".last_error(), LOGGER_NORMAL);
+        notice(t("User creation error"));
+        return;
+    }
+    $newuid = last_insert_id();
+    //~ $newuid = 1;
+    
+
+
+    foreach($account['profile'] as &$profile) {
+        foreach($profile as $k=>&$v) {
+            $v = str_replace($oldbaseurl, $newbaseurl, $v);
+            foreach(array("profile","avatar") as $k)
+                $v = str_replace($newbaseurl."/photo/".$k."/".$olduid.".jpg", $newbaseurl."/photo/".$k."/".$newuid.".jpg", $v);
+        }
+        $profile['uid'] = $newuid;
+        $r = db_import_assoc('profile', $profile);
+        if ($r===false) {
+            logger("uimport:insert profile ".$profile['profile-name']." : ERROR : ".last_error(), LOGGER_NORMAL);
+            info(t("User profile creation error"));
+            import_cleanup($newuid);
+            return;
+        }
+    }
+
+    $errorcount=0;
+    foreach($account['contact'] as &$contact) {
+        if ($contact['uid'] == $olduid && $contact['self'] == '1'){
+            foreach($contact as $k=>&$v) {
+                $v = str_replace($oldbaseurl, $newbaseurl, $v);
+                foreach(array("profile","avatar","micro") as $k)
+                    $v = str_replace($newbaseurl."/photo/".$k."/".$olduid.".jpg", $newbaseurl."/photo/".$k."/".$newuid.".jpg", $v);
+            }
+        }
+         if ($contact['uid'] == $olduid && $contact['self'] == '0') {
+            switch ($contact['network']){
+                case NETWORK_DFRN:
+                    // send moved message
+                    break;
+                case NETWORK_ZOT:
+                    // TODO handle zot network
+                    break;
+                case NETWORK_MAIL2:
+                    // TODO ?
+                    break;
+                case NETWORK_FEED:
+                case NETWORK_MAIL:
+                    // Nothing to do
+                    break;
+                default:
+                    // archive other contacts
+                    $contact['archive'] = "1";
+            }
+        }
+        $contact['uid'] = $newuid;
+        $r = db_import_assoc('contact', $contact);
+        if ($r===false) {
+            logger("uimport:insert contact ".$contact['nick'].",".$contact['network']." : ERROR : ".last_error(), LOGGER_NORMAL);
+            $errorcount++;
+        } else {
+            $contact['newid'] = last_insert_id();
+        }
+    }
+    if ($errorcount>0) {
+        notice( sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount) );
+    }
+
+    foreach($account['group'] as &$group) {
+        $group['uid'] = $newuid;
+        $r = db_import_assoc('group', $group);
+        if ($r===false) {
+            logger("uimport:insert group ".$group['name']." : ERROR : ".last_error(), LOGGER_NORMAL);
+        } else {
+            $group['newid'] = last_insert_id();
+        }
+    }
+
+    foreach($account['group_member'] as &$group_member) {
+        $group_member['uid'] = $newuid;
+        
+        $import = 0;
+        foreach($account['group'] as $group) {
+            if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {
+                $group_member['gid'] = $group['newid'];
+                $import++;
+                break;
+            }
+        }
+        foreach($account['contact'] as $contact) {
+            if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) {
+                $group_member['contact-id'] = $contact['newid'];
+                $import++;
+                break;
+            }
+        }
+        if ($import==2) {
+            $r = db_import_assoc('group_member', $group_member);
+            if ($r===false) {
+                logger("uimport:insert group member ".$group_member['id']." : ERROR : ".last_error(), LOGGER_NORMAL);
+            }
+        }
+    }
+
+
+
+    
+    
+    foreach($account['photo'] as &$photo) {
+        $photo['uid'] = $newuid;
+        $photo['data'] = hex2bin($photo['data']);
+        
+        $p = new Photo($photo['data'], $photo['type']);
+        $r = $p->store(
+            $photo['uid'],
+            $photo['contact-id'], //0
+            $photo['resource-id'],
+            $photo['filename'],
+            $photo['album'],
+            $photo['scale'],
+            $photo['profile'], //1
+            $photo['allow_cid'],
+            $photo['allow_gid'],
+            $photo['deny_cid'],
+            $photo['deny_gid']
+        );
+        
+        if ($r===false) {
+            logger("uimport:insert photo ".$photo['resource-id'].",". $photo['scale']. " : ERROR : ".last_error(), LOGGER_NORMAL);
+        }
+    } 
+    
+    foreach($account['pconfig'] as &$pconfig) {
+        $pconfig['uid'] = $newuid;
+        $r = db_import_assoc('pconfig', $pconfig);
+        if ($r===false) {
+            logger("uimport:insert pconfig ".$pconfig['id']. " : ERROR : ".last_error(), LOGGER_NORMAL);
+        }
+    } 
+     
+    
+    info(t("Done. You can now login with your username and password"));
+    goaway( $a->get_baseurl() ."/login");
+    
+    
+}
\ No newline at end of file
diff --git a/mod/register.php b/mod/register.php
index a8fa100c8..208f97bcb 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -42,6 +42,7 @@ function register_post(&$a) {
 		$verified = 0;
 		break;
 	}
+    
 
 	require_once('include/user.php');
 
@@ -234,7 +235,7 @@ function register_content(&$a) {
 			'$yes_selected' => ' checked="checked" ',
 			'$no_selected'  => '',
 			'$str_yes'      => t('Yes'),
-			'$str_no'       => t('No')
+			'$str_no'       => t('No'),
 		));
 	}
 
@@ -275,7 +276,8 @@ function register_content(&$a) {
 		'$email'     => $email,
 		'$nickname'  => $nickname,
 		'$license'   => $license,
-		'$sitename'  => $a->get_hostname()
+		'$sitename'  => $a->get_hostname(),
+      
 	));
 	return $o;
 
diff --git a/mod/uexport.php b/mod/uexport.php
index e1fb22855..f216f551f 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,46 +1,174 @@
 <?php
 
-function uexport_init(&$a) {
 
+function uexport_init(&$a){
 	if(! local_user())
 		killme();
-
-	$user = array();
-	$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-		local_user()
+        
+	$tabs = array(
+		array(
+			'label'	=> t('Account settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings',
+			'selected'	=> '',
+		),	
+		array(
+			'label'	=> t('Display settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/display',
+			'selected'	=>'',
+		),	
+		
+		array(
+			'label'	=> t('Connector settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
+			'selected'	=> '',
+		),
+		array(
+			'label'	=> t('Plugin settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/addon',
+			'selected'	=> '',
+		),
+		array(
+			'label' => t('Connected apps'),
+			'url' => $a->get_baseurl(true) . '/settings/oauth',
+			'selected' => '',
+		),
+		array(
+			'label' => t('Export personal data'),
+			'url' => $a->get_baseurl(true) . '/uexport',
+			'selected' => 'active'
+		),
+		array(
+			'label' => t('Remove account'),
+			'url' => $a->get_baseurl(true) . '/removeme',
+			'selected' => ''
+		)
 	);
+	
+	$tabtpl = get_markup_template("generic_links_widget.tpl");
+	$a->page['aside'] = replace_macros($tabtpl, array(
+		'$title' => t('Settings'),
+		'$class' => 'settings-widget',
+		'$items' => $tabs,
+	));
+}
+
+function uexport_content(&$a){
+    
+    if ($a->argc > 1) {
+        header("Content-type: application/json");
+        header('Content-Disposition: attachment; filename="'.$a->user['nickname'].'.'.$a->argv[1].'"');
+        switch($a->argv[1]) {
+            case "backup": uexport_all($a); killme(); break;
+            case "account": uexport_account($a); killme(); break;
+            default:
+                killme();
+        }
+    }
+
+    /**
+      * options shown on "Export personal data" page
+      * list of array( 'link url', 'link text', 'help text' )
+      */
+    $options = array(
+            array('/uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')),
+            array('/uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')),
+    );
+    call_hooks('uexport_options', $options);
+        
+    $tpl = get_markup_template("uexport.tpl");
+    return replace_macros($tpl, array(
+        '$baseurl' => $a->get_baseurl(),
+        '$title' => t('Export personal data'),
+        '$options' => $options
+    ));
+    
+    
+}
+
+function _uexport_multirow($query) {
+	$result = array();
+	$r = q($query);
+	if(count($r)) {
+		foreach($r as $rr){
+            $p = array();
+			foreach($rr as $k => $v)
+				$p[$k] = $v;
+            $result[] = $p;
+        }
+	}
+    return $result;
+}
+
+function _uexport_row($query) {
+	$result = array();
+	$r = q($query);
 	if(count($r)) {
 		foreach($r as $rr)
 			foreach($rr as $k => $v)
-				$user[$k] = $v;
+				$result[$k] = $v;
 
 	}
-	$contact = array();
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d ",
-		intval(local_user())
+    return $result;
+}
+
+
+function uexport_account($a){
+
+	$user = _uexport_row(
+        sprintf( "SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval(local_user()) )
 	);
-	if(count($r)) {
-		foreach($r as $rr)
-			foreach($rr as $k => $v)
-				$contact[][$k] = $v;
-
-	}
-
-	$profile = array();
-	$r = q("SELECT * FROM `profile` WHERE `uid` = %d ",
-		intval(local_user())
+    
+	$contact = _uexport_multirow(
+        sprintf( "SELECT * FROM `contact` WHERE `uid` = %d ",intval(local_user()) )
 	);
-	if(count($r)) {
-		foreach($r as $rr)
-			foreach($rr as $k => $v)
-				$profile[][$k] = $v;
-	}
 
-	$output = array('user' => $user, 'contact' => $contact, 'profile' => $profile );
 
-	header("Content-type: application/json");
+	$profile =_uexport_multirow(
+        sprintf( "SELECT * FROM `profile` WHERE `uid` = %d ", intval(local_user()) )
+	);
+
+    $photo = _uexport_multirow(
+        sprintf( "SELECT * FROM photo WHERE uid = %d AND profile = 1", intval(local_user()) )
+    );
+    foreach ($photo as &$p) $p['data'] = bin2hex($p['data']);
+
+    $pconfig = _uexport_multirow(
+        sprintf( "SELECT * FROM pconfig WHERE uid = %d",intval(local_user()) )
+    );
+
+    $group = _uexport_multirow(
+        sprintf( "SELECT * FROM group WHERE uid = %d",intval(local_user()) )
+    );
+    
+    $group_member = _uexport_multirow(
+        sprintf( "SELECT * FROM group_member WHERE uid = %d",intval(local_user()) )
+    );
+
+	$output = array(
+        'version' => FRIENDICA_VERSION,
+        'schema' => DB_UPDATE_VERSION,
+        'baseurl' => $a->get_baseurl(),
+        'user' => $user, 
+        'contact' => $contact, 
+        'profile' => $profile, 
+        'photo' => $photo,
+        'pconfig' => $pconfig,
+        'group' => $group,
+        'group_member' => $group_member,
+    );
+
+    //echo "<pre>"; var_dump(json_encode($output)); killme();
 	echo json_encode($output);
 
+}
+
+/**
+ * echoes account data and items as separated json, one per line
+ */
+function uexport_all(&$a) {
+    
+    uexport_account($a);
+
 	$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
 		intval(local_user())
 	);
@@ -66,7 +194,4 @@ function uexport_init(&$a) {
 		echo json_encode($output);
 	}
 
-
-	killme();
-
 }
\ No newline at end of file
diff --git a/mod/uimport.php b/mod/uimport.php
new file mode 100644
index 000000000..f5f7366f5
--- /dev/null
+++ b/mod/uimport.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * View for user import
+ */
+
+require_once("include/uimport.php");
+
+function uimport_post(&$a) {
+	switch($a->config['register_policy']) {
+        case REGISTER_OPEN:
+            $blocked = 0;
+            $verified = 1;
+            break;
+
+        case REGISTER_APPROVE:
+            $blocked = 1;
+            $verified = 0;
+            break;
+
+        default:
+        case REGISTER_CLOSED:
+            if((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {
+                notice( t('Permission denied.') . EOL );
+                return;
+            }
+            $blocked = 1;
+            $verified = 0;
+            break;
+	}
+    
+    if (x($_FILES,'accountfile')){
+        // TODO: pass $blocked / $verified, send email to admin on REGISTER_APPROVE
+        import_account($a, $_FILES['accountfile']);
+        return;
+    }
+}
+
+function uimport_content(&$a) {
+    $tpl = get_markup_template("uimport.tpl");
+    return replace_macros($tpl, array(
+        '$regbutt' => t('Import'),
+        '$import' => array(
+            'title' => t("Move account"),
+            'text' => t("You can move here an account from another Friendica server. <br>
+                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>
+                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"),
+            'field' => array('accountfile', t('Account file'),'<input id="id_accountfile" name="accountfile" type="file">', t('To export your accont, go to "Settings->Export your porsonal data" and select "Export account"')),
+        ),  
+    ));
+}
diff --git a/view/register.tpl b/view/register.tpl
index 8ce1d20ac..7cf11881a 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -55,6 +55,7 @@
 		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
 	</div>
 	<div id="register-submit-end" ></div>
+    
 </form>
 
 $license
diff --git a/view/uexport.tpl b/view/uexport.tpl
new file mode 100644
index 000000000..30d11d58e
--- /dev/null
+++ b/view/uexport.tpl
@@ -0,0 +1,9 @@
+<h3>$title</h3>
+
+
+{{ for $options as $o }}
+<dl>
+    <dt><a href="$baseurl/$o.0">$o.1</a></dt>
+    <dd>$o.2</dd>
+</dl>
+{{ endfor }}
\ No newline at end of file
diff --git a/view/uimport.tpl b/view/uimport.tpl
new file mode 100644
index 000000000..fb34addd4
--- /dev/null
+++ b/view/uimport.tpl
@@ -0,0 +1,11 @@
+<form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
+<h1>$import.title</h1>
+    <p>$import.text</p>
+     {{inc field_custom.tpl with $field=$import.field }}{{ endinc }}
+     
+     
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
+	</div>
+	<div id="register-submit-end" ></div>    
+</form>
\ No newline at end of file