diff --git a/masquerade.module b/masquerade.module
index 76fc6b3..bf72a02 100644
--- a/masquerade.module
+++ b/masquerade.module
@@ -273,7 +273,7 @@ function masquerade_block_form_submit($form, &$form_state) {
     throw new AccessDeniedHttpException();
   }
   else {
-    drupal_goto($_SERVER['HTTP_REFERER']);
+    drupal_goto(drupal_container()->get('request')->server->get('HTTP_REFERER'));
   }
 }
 
@@ -283,7 +283,7 @@ function masquerade_block_form_submit($form, &$form_state) {
 function masquerade_switch_user_page($uid) {
   $token = drupal_container()->get('request')->query->get('token');
   if (isset($token) && drupal_valid_token($token, 'masquerade/switch/' . $uid) && masquerade_switch_user($uid)) {
-    drupal_goto($_SERVER['HTTP_REFERER']);
+    drupal_goto(drupal_container()->get('request')->server->get('HTTP_REFERER'));
   }
   else {
     throw new AccessDeniedHttpException();
@@ -310,7 +310,7 @@ function masquerade_switch_user($uid) {
   if (!is_numeric($uid) || !($new_user = user_load($uid))) {
     drupal_set_message(t('The requested user ID does not exist.'));
     watchdog('masquerade', 'Bad target user ID %uid.', array('%uid' => $uid), WATCHDOG_ERROR);
-    return drupal_goto($_SERVER['HTTP_REFERER']);
+    return drupal_goto(drupal_container()->get('request')->server->get('HTTP_REFERER'));
   }
 
   if ($user->uid == $uid || isset($user->masquerading)) {
@@ -385,7 +385,7 @@ function masquerade_switch_back_page() {
     $olduser = $user;
     masquerade_switch_back();
     drupal_set_message(t('You are no longer masquerading as !masq_as and are now logged in as !user.', array('!user' => theme('username', array('account' => $user)), '!
-    drupal_goto($_SERVER['HTTP_REFERER']);
+    drupal_goto(drupal_container()->get('request')->server->get('HTTP_REFERER'));
   }
   else {
     throw new AccessDeniedHttpException();