diff --git a/app/controllers/calendar/date.php b/app/controllers/calendar/date.php
index 72f3a405931cf766e17c2ef57eb6890828f3188e..eda171b94a86343a03d81d0ee5c03d884f905a4f 100644
--- a/app/controllers/calendar/date.php
+++ b/app/controllers/calendar/date.php
@@ -27,9 +27,8 @@ class Calendar_DateController extends AuthenticatedController
             $range_id = $range_and_id[1];
         }
         if (!$range) {
-            //Show the personal calendar of the current user:
+            $range_id = Request::option('user_id', $GLOBALS['user']->id);
             $range = 'user';
-            $range_id = $GLOBALS['user']->id;
         }
 
         $owner = null;
@@ -325,15 +324,12 @@ class Calendar_DateController extends AuthenticatedController
 
         if ($this->date->isNew()) {
             if (!($owner instanceof Course)) {
-                //Assign the date to the calendar of the current user by default:
-                $user = User::findCurrent();
-                if ($user) {
-                    $this->calendar_assignment_items[] = [
-                        'value'     => $user->id,
-                        'name'      => $user->getFullName(),
-                        'deletable' => true
-                    ];
-                }
+                //Assign the date to the calendar of the owner by default:
+                $this->calendar_assignment_items[] = [
+                    'value'     => $owner->id,
+                    'name'      => $owner->getFullName(),
+                    'deletable' => true
+                ];
             }
         } else {
             $exceptions = CalendarDateException::findBySql(