diff --git a/entity.module b/entity.module
index 432d469..3d0a2b4 100644
--- a/entity.module
+++ b/entity.module
@@ -79,6 +79,7 @@ function entity_type_supports($entity_type, $op) {
  *   The type of the entity.
  * @param $entity
  *   The entity to save.
+ *
  * @return
  *   For entity types provided by the CRUD API, SAVED_NEW or SAVED_UPDATED is
  *   returned depending on the operation performed. If there is no information
@@ -86,7 +87,7 @@ function entity_type_supports($entity_type, $op) {
  *
  * @see entity_type_supports()
  */
-function entity_save($entity_type, &$entity) {
+function entity_save($entity_type, $entity) {
   $info = entity_get_info($entity_type);
   if (method_exists($entity, 'save')) {
     return $entity->save();
diff --git a/modules/callbacks.inc b/modules/callbacks.inc
index 74ef308..193e9bd 100644
--- a/modules/callbacks.inc
+++ b/modules/callbacks.inc
@@ -673,11 +673,11 @@ function entity_metadata_create_node($values = array()) {
 /**
  * Callback to save a user account.
  */
-function entity_metadata_user_save(&$account) {
+function entity_metadata_user_save($account) {
   $edit = (array) $account;
   // Don't save the hashed password as password.
   unset($edit['pass']);
-  $account = user_save($account, $edit);
+  user_save($account, $edit);
 }
 
 /**