Friendpaste

diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl
index 94adac8..ff66dfb 100644
--- a/src/couchdb/couch_auth_cache.erl
+++ b/src/couchdb/couch_auth_cache.erl
@@ -293,7 +293,7 @@ refresh_entry(Db, #doc_info{high_seq = DocSeq} = DocInfo) ->
 user_creds(#doc{deleted = true}) ->
     nil;
 user_creds(#doc{} = Doc) ->
-    {Creds} = couch_query_servers:json_doc(Doc),
+    {Creds} = couch_doc:to_json_obj(Doc, []),
     Creds.
 
 
@@ -360,7 +360,7 @@ get_user_props_from_db(UserName) ->
             DocId = <<"org.couchdb.user:", UserName/binary>>,
             try
                 {ok, Doc} = couch_db:open_doc(Db, DocId, [conflicts]),
-                {DocProps} = couch_query_servers:json_doc(Doc),
+                {DocProps} = couch_doc:to_json_obj(Doc, []),
                 DocProps
             catch
             _:_Error ->