diff --git a/dspace-api/src/main/java/org/dspace/eperson/AccountManager.java b/dspace-api/src/main/java/org/dspace/eperson/AccountManager.java
index b30c5970a8..938663c43a 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/AccountManager.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/AccountManager.java
@@ -46,7 +46,6 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
@@ -57,7 +56,6 @@ import org.dspace.core.I18nUtil;
 import org.dspace.core.Utils;
 import org.dspace.storage.rdbms.DatabaseManager;
 import org.dspace.storage.rdbms.TableRow;
-import org.dspace.app.webui.util.UIUtil;
 
 /**
  * Methods for handling registration by email and forgotten passwords. When
@@ -96,11 +94,11 @@ public class AccountManager
      * @param email
      *            Email address to send the registration email to
      */
-    public static void sendRegistrationInfo(HttpServletRequest request, Context context, String email)
+    public static void sendRegistrationInfo(Context context, String email)
             throws SQLException, IOException, MessagingException,
             AuthorizeException
     {
-        sendInfo(request, context, email, true, true);
+        sendInfo(context, email, true, true);
     }
 
     /**
@@ -116,11 +114,11 @@ public class AccountManager
      * @param email
      *            Email address to send the forgot-password email to
      */
-    public static void sendForgotPasswordInfo(HttpServletRequest request, Context context, String email)
+    public static void sendForgotPasswordInfo(Context context, String email)
             throws SQLException, IOException, MessagingException,
             AuthorizeException
     {
-        sendInfo(request, context, email, false, true);
+        sendInfo(context, email, false, true);
     }
 
     /**
@@ -222,7 +220,7 @@ public class AccountManager
      * registration; otherwise, it is for forgot-password @param send If true,
      * send email; otherwise do not send any email
      */
-    protected static TableRow sendInfo(HttpServletRequest request, Context context, String email,
+    protected static TableRow sendInfo(Context context, String email,
             boolean isRegister, boolean send) throws SQLException, IOException,
             MessagingException, AuthorizeException
     {
@@ -255,7 +253,7 @@ public class AccountManager
 
         if (send)
         {
-            sendEmail(request, email, isRegister, rd);
+            sendEmail(context, email, isRegister, rd);
         }
 
         return rd;
@@ -279,7 +277,7 @@ public class AccountManager
      * @exception IOException
      *                If an error occurs while reading the email template.
      */
-    private static void sendEmail(HttpServletRequest request, String email, boolean isRegister, TableRow rd)
+    private static void sendEmail(Context context, String email, boolean isRegister, TableRow rd)
             throws MessagingException, IOException, SQLException
     {
         String base = ConfigurationManager.getProperty("dspace.url");
@@ -290,7 +288,7 @@ public class AccountManager
                 isRegister ? "register" : "forgot").append("?")
                 .append("token=").append(rd.getStringColumn("token"))
                 .toString();
-        Locale locale = UIUtil.obtainContext(request).getCurrentLocale();
+        Locale locale = context.getCurrentLocale();
         Email bean = ConfigurationManager.getEmail(I18nUtil.getEmailFilename(locale, isRegister ? "register"
                 : "change_password"));
         bean.addRecipient(email);
diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/RegisterServlet.java b/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/RegisterServlet.java
index d5e59cc446..fecab7dc94 100644
--- a/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/RegisterServlet.java
+++ b/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/RegisterServlet.java
@@ -291,7 +291,7 @@ public class RegisterServlet extends DSpaceServlet
 
                             try
                             {
-                                AccountManager.sendRegistrationInfo(request, context, email);
+                                AccountManager.sendRegistrationInfo(context, email);
                             }
                             catch (javax.mail.SendFailedException e)
                             {
@@ -403,7 +403,7 @@ public class RegisterServlet extends DSpaceServlet
                     log.info(LogManager.getHeader(context,
                             "sendtoken_forgotpw", "email=" + email));
 
-                    AccountManager.sendForgotPasswordInfo(request, context, email);
+                    AccountManager.sendForgotPasswordInfo(context, email);
                     JSPManager.showJSP(request, response,
                             "/register/password-token-sent.jsp");