diff --git a/app/controllers/consultation/consultation_controller.php b/app/controllers/consultation/consultation_controller.php
index 5d3f20ab0b914b4836abc02210601fe47deabe11..c69ab16584b1057389f91cdbeddd72822c6d77b7 100644
--- a/app/controllers/consultation/consultation_controller.php
+++ b/app/controllers/consultation/consultation_controller.php
@@ -12,7 +12,13 @@ abstract class ConsultationController extends AuthenticatedController
     {
         parent::before_filter($action, $args);
 
-        $this->range = Context::get() ?: User::findByUsername(Request::username('username', $GLOBALS['user']->username));
+        if (Request::submitted('username')) {
+            $this->range = User::findByUsername(Request::username('username'));
+        } elseif (Request::submitted('cid')) {
+            $this->range = Context::get();
+        } else {
+            $this->range = $GLOBALS['user']->getAuthenticatedUser();
+        }
 
         if ($this->range instanceof User) {
             URLHelper::addLinkParam('username', $this->range->username);