diff --git a/lib/casserver/server.rb b/lib/casserver/server.rb
index a86e405..ad6c228 100644
--- a/lib/casserver/server.rb
+++ b/lib/casserver/server.rb
@@ -293,6 +293,7 @@ def self.init_database!
       @service = clean_service_url(params['service'])
       @renew = params['renew']
       @gateway = params['gateway'] == 'true' || params['gateway'] == '1'
+      @username = request.cookies['optimis_username']
 
       if tgc = request.cookies['tgt']
         tgt, tgt_error = validate_ticket_granting_ticket(tgc)
@@ -429,6 +430,10 @@ def self.init_database!
             :service => @service,
             :request => @env
           )
+          if params[:remember_me]
+            response.set_cookie('optimis_username', value: @username)
+          end
+
           if credentials_are_valid
             @authenticated = true
             @authenticated_username = @username