diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index 98a3299..d6623d5 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -169,10 +169,14 @@
     $self->hook(
       before_dispatch => sub {
         my $c = shift;
-        if (my $host = $c->req->headers->header('X-Forwarded-Host')) {
+        my $h = $c->req->headers;
+        if (my $host = $h->header('X-Forwarded-Host')) {
+
+          my $proto = $h->header('X-Forwarded-Proto') // ($conf->{https_only} ? 'https' : undef);
+
           foreach ($c->req->url->base) {
             $_->host($host);
-            $_->scheme(undef);
+            $_->scheme($proto);
             $_->port(undef);
           };
         };
diff --git a/lib/Kalamar/Plugin/Auth.pm b/lib/Kalamar/Plugin/Auth.pm
index e65972b..4cc2a9e 100644
--- a/lib/Kalamar/Plugin/Auth.pm
+++ b/lib/Kalamar/Plugin/Auth.pm
@@ -1624,7 +1624,7 @@
       # Get authorization token
       my $client_id = $c->stash('client_id');
       my $name = $v->param('name');
-      my $redirect_url = $c->url_for->query({name => $name});
+      my $redirect_url = $c->url_for->query({name => $name})->to_abs;
 
       $c->auth->new_token_p(
         client_id => $client_id,