diff --git a/dba/patches/1.2.3.sql b/dba/patches/1.2.3.sql
new file mode 100644
index 00000000..ea5ef208
--- /dev/null
+++ b/dba/patches/1.2.3.sql
@@ -0,0 +1,37 @@
+
+-- Sort out accessing calendar entries.
+
+BEGIN;
+SELECT check_db_revision(1,2,2);
+
+ALTER TABLE role_member DROP CONSTRAINT "$1";
+ALTER TABLE role_member ADD CONSTRAINT "$1" (role_no) REFERENCES roles(role_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+ALTER TABLE role_member DROP CONSTRAINT "$2";
+ALTER TABLE role_member ADD CONSTRAINT "$2" (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+ 
+ALTER TABLE session DROP CONSTRAINT "$1";
+ALTER TABLE session ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+
+ALTER TABLE relationship DROP CONSTRAINT "$1";
+ALTER TABLE relationship ADD CONSTRAINT "$1" FOREIGN KEY (from_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+ALTER TABLE relationship DROP CONSTRAINT "$2";
+ALTER TABLE relationship ADD CONSTRAINT "$2" FOREIGN KEY (to_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+
+ALTER TABLE usr_setting DROP CONSTRAINT "$1";
+ALTER TABLE usr_setting ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+
+ALTER TABLE tmp_password DROP CONSTRAINT "$1";
+ALTER TABLE tmp_password ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+
+ALTER TABLE caldav_data DROP CONSTRAINT "$1";
+ALTER TABLE caldav_data ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+ALTER TABLE caldav_data DROP CONSTRAINT "$2";
+ALTER TABLE caldav_data ADD CONSTRAINT "$2" FOREIGN KEY (logged_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+
+ALTER TABLE property DROP CONSTRAINT "$1";
+ALTER TABLE property ADD CONSTRAINT "$1" FOREIGN KEY (changed_by) REFERENCES usr(user_no) ON UPDATE CASCADE;
+
+SELECT new_db_revision(1,2,3, 'Mars' );
+COMMIT;
+ROLLBACK;
+
diff --git a/htdocs/users.php b/htdocs/users.php
index a469b903..a0dd8115 100644
--- a/htdocs/users.php
+++ b/htdocs/users.php
@@ -27,6 +27,7 @@ require_once("interactive-page.php");
   $browser->AddColumn( 'fullname', translate('Full Name') );
   $browser->AddColumn( 'email', translate('EMail') );
   $browser->AddColumn( 'relations', translate('Relationships'), '', '', 'relationship_list(user_no)' );
+  $browser->AddOrder( 'username', 'A' );
 
   $browser->SetJoins( 'usr' );
 
@@ -56,4 +57,4 @@ include("page-header.php");
 echo $browser->Render();
 
 include("page-footer.php");
-?>
\ No newline at end of file
+?>