diff --git a/packages/frontend/app/components/user-profile.gjs b/packages/frontend/app/components/user-profile.gjs
index 62c7e91e2e..50041c8909 100644
--- a/packages/frontend/app/components/user-profile.gjs
+++ b/packages/frontend/app/components/user-profile.gjs
@@ -1,5 +1,4 @@
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
 import { service } from '@ember/service';
 import ManageUsersSummary from 'frontend/components/manage-users-summary';
 import t from 'ember-intl/helpers/t';
@@ -8,7 +7,6 @@ import UserStatus from 'ilios-common/components/user-status';
 import PendingSingleUserUpdate from 'frontend/components/pending-single-user-update';
 import ToggleButtons from 'ilios-common/components/toggle-buttons';
 import not from 'ember-truth-helpers/helpers/not';
-import toggle from 'ilios-common/helpers/toggle';
 import UserProfileCalendar from 'frontend/components/user-profile-calendar';
 import UserProfileBio from 'frontend/components/user-profile-bio';
 import UserProfileRoles from 'frontend/components/user-profile-roles';
@@ -20,7 +18,6 @@ import LearnerGroups from 'frontend/components/user-profile/learner-groups';
 
 export default class UserProfileComponent extends Component {
   @service currentUser;
-  @tracked showCalendar = false;
 
   get userIsTheCurrentUser() {
     return Number(this.currentUser.currentUserId) === Number(this.args.user.id);
@@ -44,14 +41,14 @@ export default class UserProfileComponent extends Component {
       <PendingSingleUserUpdate @user={{@user}} @canUpdate={{@canUpdate}} />
       <div class="user-profile-actions" data-test-user-profile-actions>
         <ToggleButtons
-          @firstOptionSelected={{not this.showCalendar}}
+          @firstOptionSelected={{not @showCalendar}}
           @firstLabel={{t "general.hideCalendar"}}
           @secondLabel={{t "general.showCalendar"}}
-          @toggle={{toggle "showCalendar" this}}
+          @toggle={{@setShowCalendar}}
         />
       </div>
       <div class="blocks">
-        {{#if this.showCalendar}}
+        {{#if @showCalendar}}
           <UserProfileCalendar @user={{@user}} />
         {{/if}}
         <UserProfileBio
diff --git a/packages/frontend/app/controllers/user.js b/packages/frontend/app/controllers/user.js
index 66685b3a9f..5a5fa661e4 100644
--- a/packages/frontend/app/controllers/user.js
+++ b/packages/frontend/app/controllers/user.js
@@ -10,6 +10,7 @@ export default class UserController extends Controller {
   @service iliosConfig;
 
   queryParams = [
+    'showCalendar',
     'isManagingBio',
     'isManagingRoles',
     'isManagingCohorts',
@@ -18,6 +19,7 @@ export default class UserController extends Controller {
     'permissionsSchool',
     'permissionsYear',
   ];
+  @tracked showCalendar = false;
   @tracked isManagingBio = false;
   @tracked isManagingRoles = false;
   @tracked isManagingCohorts = false;
diff --git a/packages/frontend/app/templates/user.gjs b/packages/frontend/app/templates/user.gjs
index 376bdf837a..13fa4ff92f 100644
--- a/packages/frontend/app/templates/user.gjs
+++ b/packages/frontend/app/templates/user.gjs
@@ -2,12 +2,15 @@ import pageTitle from 'ember-page-title/helpers/page-title';
 import t from 'ember-intl/helpers/t';
 import UserProfile from 'frontend/components/user-profile';
 import set from 'ember-set-helper/helpers/set';
+import toggle from 'ilios-common/helpers/toggle';
 <template>
   {{pageTitle (t "general.admin") " | " (t "general.users") " | " @model.fullName}}
   <UserProfile
     @user={{@model}}
     @canUpdate={{@controller.canUpdate}}
     @canCreate={{@controller.canCreate}}
+    @showCalendar={{@controller.showCalendar}}
+    @setShowCalendar={{toggle "showCalendar" @controller}}
     @isManagingBio={{@controller.isManagingBio}}
     @setIsManagingBio={{set @controller "isManagingBio"}}
     @isManagingRoles={{@controller.isManagingRoles}}
diff --git a/packages/frontend/tests/integration/components/user-profile-test.gjs b/packages/frontend/tests/integration/components/user-profile-test.gjs
index 4e90377306..9e766013aa 100644
--- a/packages/frontend/tests/integration/components/user-profile-test.gjs
+++ b/packages/frontend/tests/integration/components/user-profile-test.gjs
@@ -100,6 +100,10 @@ module('Integration | Component | user-profile', function (hooks) {
     const user = this.server.create('user');
     const userModel = await this.owner.lookup('service:store').findRecord('user', user.id);
     this.set('user', userModel);
+    this.set('showCalendar', false);
+    this.set('setShowCalendar', () => {
+      this.set('showCalendar', !this.showCalendar);
+    });
 
     await render(
       <template>
@@ -107,6 +111,8 @@ module('Integration | Component | user-profile', function (hooks) {
           @user={{this.user}}
           @canUpdate={{false}}
           @canCreate={{false}}
+          @showCalendar={{this.showCalendar}}
+          @setShowCalendar={{this.setShowCalendar}}
           @isManagingBio={{false}}
           @setIsManagingBio={{(noop)}}
           @isManagingRoles={{false}}
@@ -125,14 +131,28 @@ module('Integration | Component | user-profile', function (hooks) {
       </template>,
     );
 
-    assert.notOk(component.calendar.isVisible);
-    assert.strictEqual(component.actions.calendarToggle.firstLabel.text, 'Hide Calendar');
-    assert.ok(component.actions.calendarToggle.firstButton.isChecked);
-    assert.strictEqual(component.actions.calendarToggle.secondLabel.text, 'Show Calendar');
-    assert.notOk(component.actions.calendarToggle.secondButton.isChecked);
+    assert.notOk(component.calendar.isVisible, 'calendar is not visible');
+    assert.strictEqual(
+      component.actions.calendarToggle.firstLabel.text,
+      'Hide Calendar',
+      'first toggle button label is correct',
+    );
+    assert.ok(
+      component.actions.calendarToggle.firstButton.isChecked,
+      'first toggle button is checked',
+    );
+    assert.strictEqual(
+      component.actions.calendarToggle.secondLabel.text,
+      'Show Calendar',
+      'second toggle button label is correct',
+    );
+    assert.notOk(
+      component.actions.calendarToggle.secondButton.isChecked,
+      'second toggle button is not checked',
+    );
     await component.actions.calendarToggle.secondButton.click();
-    assert.ok(component.calendar.isVisible);
+    assert.ok(component.calendar.isVisible, 'calendar is visible after toggle');
     await component.actions.calendarToggle.firstButton.click();
-    assert.notOk(component.calendar.isVisible);
+    assert.notOk(component.calendar.isVisible, 'calendar is not visible after toggle');
   });
 });