diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index 0bd2252..799d8d3 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -109,7 +109,8 @@
     'CHI',                       # Global caching mechanism
     'TagHelpers::MailToChiffre', # Obfuscate email addresses
     'KalamarHelpers',            # Specific Helpers for Kalamar
-    'KalamarUser'                # Specific Helpers for Kalamar
+    'KalamarUser',               # Specific Helpers for Kalamar
+    'ClientIP'                   # Get client IP from X-Forwarded-For
   ) {
     $self->plugin($_);
   };
diff --git a/lib/Kalamar/Plugin/KalamarUser.pm b/lib/Kalamar/Plugin/KalamarUser.pm
index 561720a..88de452 100644
--- a/lib/Kalamar/Plugin/KalamarUser.pm
+++ b/lib/Kalamar/Plugin/KalamarUser.pm
@@ -58,8 +58,6 @@
 
       return $plugin->ua unless $auth;
 
-      my $client = $c->req->headers->header('X-Forwarded-For');
-
       my $ua = Mojo::UserAgent->new(
         connect_timeout => 15,
         inactivity_timeout => 120
@@ -68,6 +66,9 @@
       # Set app to server
       $ua->server->app($c->app);
 
+      # Initiate client information
+      my $client = $c->client_ip;
+
       $ua->on(
         start => sub {
           my ($ua, $tx) = @_;