diff --git a/user_revision.module b/user_revision.module
index 6d713fc..58ba471 100644
--- a/user_revision.module
+++ b/user_revision.module
@@ -337,6 +337,9 @@ function user_revision_user_presave(&$edit, $account, $category) {
   $edit['log'] = empty($edit['log']) ? '' : $edit['log'];
   if ((isset($edit['revision']) && $edit['revision'] == 1) || $account->is_new) {
     $edit['uid'] = $account->uid;
+    if(!isset($edit['vid'])) {
+      $edit['vid'] = $account->vid;
+    }
     $edit['old_vid'] = $edit['vid'];
     unset($edit['vid']);
     $edit['timestamp'] = REQUEST_TIME;
@@ -360,7 +363,7 @@ function user_revision_user_delete($account) {
  * Save record to the database.
  */
 function _user_save_revision(&$edit, $update = NULL) {
-  if(is_object($edit['picture'])){
+  if(isset($edit['picture']) && is_object($edit['picture'])){
     $picture = $edit['picture'];
     $edit['picture'] = $picture->fid;
   }