diff --git a/Changes b/Changes
index ff9b537f..b8e7334d 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.039018 - 2018-03-
+
+  [ENHANCEMENTS]
+
+  * #371 usernames are case insensitive but case preserving
+
 2.039017 - 2018-03-20
 
   [BUG FIXES]
diff --git a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
index 4eed0b37..8d779d0a 100644
--- a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
+++ b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
@@ -36,7 +36,7 @@ sub get_user_details {
 
     my $user = try {
       $database->resultset($users_table)->find({
-          $username_column => $username
+          $username_column => { -ilike => $username },
       });
     };
 
diff --git a/lib/App/Netdisco/Web/AuthN.pm b/lib/App/Netdisco/Web/AuthN.pm
index 72f3155f..6ce04181 100644
--- a/lib/App/Netdisco/Web/AuthN.pm
+++ b/lib/App/Netdisco/Web/AuthN.pm
@@ -58,9 +58,9 @@ post '/login' => sub {
 
     if ($success) {
         my $user = schema('netdisco')->resultset('User')
-          ->find( param('username') );
+          ->find({ username => { -ilike => param('username') } });
 
-        session logged_in_user => param('username');
+        session logged_in_user => $user->username;
         session logged_in_fullname => $user->fullname;
         session logged_in_user_realm => $realm;