diff --git a/flattr.module b/flattr.module
index 117b1b5..d75aa2e 100644
--- a/flattr.module
+++ b/flattr.module
@@ -202,10 +202,10 @@ function flattr_field_formatter_view($entity_type, $entity, $field, $instance, $
 
   // Find the flattr username.
   $fields = _flattr_list_fields('user');
-  $user = user_load($entity->uid);
+  //$user = user_load($entity->uid);
   $user_field = $fields[$display['settings']['flattr_username_field']];
   if ($user_field != '<None>') {
-    $username = field_get_items('user', $user, $user_field);
+    $username = field_get_items($entity_type, $entity, $user_field);
     $username = strip_tags($username[0]['safe_value']);
   }
   else {
@@ -232,7 +232,7 @@ function flattr_field_formatter_view($entity_type, $entity, $field, $instance, $
 
   $attributes = array();
   $attributes['title'] = $title;
-  $attributes['lang'] = _flattr_language($entity->language);
+  //$attributes['lang'] = _flattr_language($entity->language);
   $attributes['rel'] = 'flattr;' . _flattr_attributes($flattr_attributes);
   $attributes['class'][] = 'FlattrButton';
   $options['attributes'] = $attributes;