diff --git a/app/models/remote_storage_authorization.rb b/app/models/remote_storage_authorization.rb
index 26c3fd4..ea6e2ac 100644
--- a/app/models/remote_storage_authorization.rb
+++ b/app/models/remote_storage_authorization.rb
@@ -23,12 +23,8 @@ class RemoteStorageAuthorization < ApplicationRecord
   after_destroy  :remove_token_expiry_job
 
   def url
-    if self.redirect_uri
-      uri = URI.parse self.redirect_uri
-      "#{uri.scheme}://#{client_id}"
-    else
-      "http://#{client_id}"
-    end
+    uri = URI.parse self.redirect_uri
+    "#{uri.scheme}://#{client_id}"
   end
 
   def delete_token_from_redis
diff --git a/spec/factories/remote_storage_authorizations.rb b/spec/factories/remote_storage_authorizations.rb
index 76c93bf..0cb47b1 100644
--- a/spec/factories/remote_storage_authorizations.rb
+++ b/spec/factories/remote_storage_authorizations.rb
@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :remote_storage_authorization do
     permissions { ["documents:rw"] }
-    client_id { "some-fancy-app" }
-    redirect_uri { "https://example.com/some-fancy-app" }
+    client_id { "app.example.com" }
+    redirect_uri { "https://app.example.com" }
     app_name { "Fancy App" }
     expire_at { 1.month.from_now }
     web_app