Index: src/main/resources/XWiki/ForgotUsername.xml
===================================================================
--- src/main/resources/XWiki/ForgotUsername.xml	(revision 27573)
+++ src/main/resources/XWiki/ForgotUsername.xml	(working copy)
@@ -268,7 +268,7 @@
   #else
     $msg.get("xe.admin.passwordreset.multipleusernames")
     #foreach($item in $results)
-      * *${xwiki.getDocument($item).name}*
+      * *${item.substring($item.indexOf('.')).substring(1)}*
     #end
 
     <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">$msg.get("xe.admin.passwordreset.login") »</a>
Index: src/main/resources/XWiki/ResetPasswordComplete.xml
===================================================================
--- src/main/resources/XWiki/ResetPasswordComplete.xml	(revision 27573)
+++ src/main/resources/XWiki/ResetPasswordComplete.xml	(working copy)
@@ -286,7 +286,7 @@
  * @param result The encrypted output.
  *#
 #macro(encrypt $value $result)
-  #set($result = $xwiki.getDocument($verifClass).getxWikiClass().getXWikiClass().get("verification").getPasswordHash($value))
+  #set($result = $xwiki.XWiki.getDocument($verifClass,$context.context).getXClass().get("verification").getPasswordHash($value))
 #end
 ##
 ##
@@ -300,7 +300,7 @@
   #set($result = false)
   #if($validationString != "" && $userName != "")
     #encrypt($validationString $encryptedValidationString)
-    #if("$!xwiki.getDocument($userName).getObject($verifClass).getProperty('verification').getValue()" == $encryptedValidationString)
+    #if("$!xwiki.XWiki.getDocument($userName,$context.context).getObject($verifClass).get('verification').getValue()" == $encryptedValidationString)
       #set($result = true)
     #end
   #end
@@ -344,7 +344,7 @@
 #set($password2 = "$!request.p2")
 #verifyRequest($userName $validationString $result)
 #if($result)
-  #set($vuserDoc = $xwiki.getDocument($userName))
+  #set($vuserDoc = $xwiki.XWiki.getDocument($userName,$context.context).newDocument($context.context))
   #if($request.getParameterMap().containsKey("p")) ## Second step, set the user password
     #if($password == "")
       #displayForm($msg.get("xe.admin.passwordreset.notempty") $userName $validationString)
@@ -367,7 +367,8 @@
   #end
 #else
   #set($backToResetLink = " [$msg.get('xe.admin.passwordreset.backtoreset') »>ResetPassword]")
-  #error("$msg.get('xe.admin.passwordreset.wrongparameters') ${backToResetLink}")
+  #error("$msg.get('xe.admin.passwordreset.wrongparameters')")
+  ${backToResetLink}
 #end
 ##
 ## Clear private variables, so that they cannot be accessed from the rest of the page (comments, panels...)
Index: src/main/resources/XWiki/ResetPassword.xml
===================================================================
--- src/main/resources/XWiki/ResetPassword.xml	(revision 27573)
+++ src/main/resources/XWiki/ResetPassword.xml	(working copy)
@@ -318,9 +318,9 @@
 #else ## Second step, generate the verification string, store it, and send the email
   ## TODO: Once the usernames are not bound to the XWiki space, revisit this code
   #if($userName.indexOf('.') != -1)
-    #set($userDoc = $xwiki.getDocument(${userName}))
+    #set($userDoc = $xwiki.XWiki.getDocument(${userName},$context.context).newDocument($context.context))
   #else
-    #set($userDoc = $xwiki.getDocument("XWiki.${userName}"))
+    #set($userDoc = $xwiki.XWiki.getDocument("XWiki.${userName}",$context.context).newDocument($context.context))
   #end
   ## Check if the user exists and has a valid email address configured in his profile
   #set($userObj = "")