diff --git a/app/Services/Applications/OIDC/Factory/AuthorizationCodeClientFactory.php b/app/Services/Applications/OIDC/Factory/AuthorizationCodeClientFactory.php
index 7b7e2cc..9259e75 100644
--- a/app/Services/Applications/OIDC/Factory/AuthorizationCodeClientFactory.php
+++ b/app/Services/Applications/OIDC/Factory/AuthorizationCodeClientFactory.php
@@ -23,7 +23,8 @@ public function create(
     ): ClientCredentialsData {
         $client = $this->client->createAuthorizationCodeGrantClient(
             name: $data->name,
-            redirectUris: $data->signInUris,
+            // laravel-oidc-server expects redirect_uris to consist of sign_in and sign_out uris.
+            redirectUris: array_merge($data->signInUris, $data->signOutUris),
             confidential: ApplicationTypeEnum::Web === $data->type,
         );
 
diff --git a/app/Services/Applications/OIDC/OidcConfigResolver.php b/app/Services/Applications/OIDC/OidcConfigResolver.php
index d43ce81..9babdc9 100644
--- a/app/Services/Applications/OIDC/OidcConfigResolver.php
+++ b/app/Services/Applications/OIDC/OidcConfigResolver.php
@@ -21,4 +21,16 @@ public function hasClientSecret(): bool
     {
         return ApplicationTypeEnum::SPA !== $this->applicationType;
     }
+
+    public function needSignInUris(): bool
+    {
+
+        return ApplicationTypeEnum::Machine !== $this->applicationType;
+    }
+
+    public function needSignOutUris(): bool
+    {
+
+        return ApplicationTypeEnum::Machine !== $this->applicationType;
+    }
 }
diff --git a/app/Services/Applications/OIDC/OidcService.php b/app/Services/Applications/OIDC/OidcService.php
index fd4cead..e7e8376 100644
--- a/app/Services/Applications/OIDC/OidcService.php
+++ b/app/Services/Applications/OIDC/OidcService.php
@@ -10,8 +10,7 @@
 use App\Models\{ConnectionProtocol, ConnectionStatus};
 use App\Services\{ApplicationLogoUploader, ConnectedAppService};
 use App\Services\Applications\OIDC\Factory\ClientCreationFactory;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\{DB, Log};
 use Illuminate\Support\Str;
 use Throwable;
 
diff --git a/resources/views/pages/apps/oidc/⚡create.blade.php b/resources/views/pages/apps/oidc/⚡create.blade.php
index 0d3fa7e..c25867e 100644
--- a/resources/views/pages/apps/oidc/⚡create.blade.php
+++ b/resources/views/pages/apps/oidc/⚡create.blade.php
@@ -1,9 +1,10 @@
 <?php
 
 use App\Concerns\HandlesOperations;
+use App\Data\Application\CreatedApplicationData;
 use App\Data\Application\StoreOIDCAppData;
 use App\Data\ConnectedApp\ConnectedAppData;
-use App\Enums\{ApplicationTypeEnum, ConnectionProtocolEnum, UserAccessTypeEnum};
+use App\Enums\{ApplicationTypeEnum, ConnectionProtocolEnum, Permissions\AppPermissionEnum, UserAccessTypeEnum};
 use App\Livewire\Concerns\Choices\{ChoiceField, WithSearchableChoices};
 use App\Livewire\Concerns\WithRepeaterFields;
 use App\Livewire\Forms\StoreOIDCAppForm;
@@ -57,17 +58,14 @@ public function render()
 
     public function save(bool $goBack = true): void
     {
+        $this->authorize(AppPermissionEnum::Create->value);
         $this->form->validate();
         $this->attempt(
             function () {
                 $data = StoreOIDCAppData::fromArray($this->applicationType, $this->form->pull());
                 $appdata = $this->oidcService->createApp($data);
 
-                // Show the credentials
-                $this->created = true;
-                $this->clientId = $appdata->clientCredentials->clientId;
-                $this->clientSecret = $appdata->clientCredentials->clientSecret;
-                $this->app = $appdata->application;
+                $this->showCredentials($appdata);
             }
         );
     }
@@ -105,6 +103,24 @@ public function clearRoles(): void
         $this->clearChoice('roles');
     }
 
+    #[Computed]
+    public function hasClientSecret(): bool
+    {
+        return $this->configResolver->for($this->applicationType)->hasClientSecret();
+    }
+
+    #[Computed]
+    public function needSignInUris(): bool
+    {
+        return $this->configResolver->for($this->applicationType)->needSignInUris();
+    }
+
+    #[Computed]
+    public function needSignOutUris(): bool
+    {
+        return $this->configResolver->for($this->applicationType)->needSignOutUris();
+    }
+
     protected function choiceFields(): array
     {
         return [
@@ -116,10 +132,12 @@ protected function choiceFields(): array
         ];
     }
 
-    #[Computed]
-    public function hasClientSecret(): bool
+    private function showCredentials(CreatedApplicationData $appData): void
     {
-        return $this->configResolver->for($this->applicationType)->hasClientSecret();
+        $this->clientId = $appData->clientCredentials->clientId;
+        $this->clientSecret = $appData->clientCredentials->clientSecret;
+        $this->app = $appData->application;
+        $this->created = true;
     }
 };
 ?>
@@ -132,7 +150,7 @@ public function hasClientSecret(): bool
         >
             <div class="flex w-full justify-center items-center pt-6">
                 <article class="mx-auto flex items-center gap-4">
-                    <x-mary-avatar :image="$app->logo ? asset($app->logo) : asset('images/app-icon-placeholder.png')"
+                    <x-mary-avatar :image="$app?->logo ? asset($app->logo) : asset('images/app-icon-placeholder.png')"
                                    alt="App logo"
                                    class="w-14! rounded-lg! p-2"/>
                     <h1 class="text-2xl font-medium">{{$app->name}}</h1>
@@ -186,37 +204,40 @@ class="btn-primary"
                     </div>
                 </div>
                 <!-- General settings end -->
-
-                <!-- Sign-in uris start -->
-                <hr>
-                <div class="flex gap-4 flex-col w-full md:flex-row">
-                    <article class="w-full md:w-2/5">
-                        <h2 class="font-bold">Sign In Redirect URIs</h2>
-                        <p class="text-sm text-gray-500 max-w-70 mt-4">
-                            {{config('app.name')}} sends response and ID Token back to these URIs.
-                        </p>
-                    </article>
-                    <div class="w-full md:w-3/5">
-                        <x-shared.repeater-input model="form.signInUris" :items="$form->signInUris"/>
+                @if($this->needSignInUris)
+                    <!-- Sign-in uris start -->
+                    <hr>
+                    <div class="flex gap-4 flex-col w-full md:flex-row">
+                        <article class="w-full md:w-2/5">
+                            <h2 class="font-bold">Sign In Redirect URIs</h2>
+                            <p class="text-sm text-gray-500 max-w-70 mt-4">
+                                Allowed URIs which this app can ask to get the response back.
+                            </p>
+                        </article>
+                        <div class="w-full md:w-3/5">
+                            <p class="text-xs text-gray-500 mb-2">You can add this later.</p>
+                            <x-shared.repeater-input model="form.signInUris" :items="$form->signInUris"/>
+                        </div>
                     </div>
-                </div>
-                <!-- Sign-in uris end -->
-
-                <!-- Sign-out uris start -->
-                <hr>
-                <div class="flex gap-4 flex-col w-full md:flex-row">
-                    <article class="w-full md:w-2/5">
-                        <h2 class="font-bold">Sign out Redirect URIs</h2>
-                        <p class="text-sm text-gray-500 max-w-70 mt-4">
-                            {{config('app.name')}} sends back the user to these URIs after logout.
-                        </p>
-                    </article>
-                    <div class="w-full md:w-3/5">
-                        <x-shared.repeater-input model="form.signOutUris" :items="$form->signOutUris"/>
+                    <!-- Sign-in uris end -->
+                @endif
+                @if($this->needSignOutUris)
+                    <!-- Sign-out uris start -->
+                    <hr>
+                    <div class="flex gap-4 flex-col w-full md:flex-row">
+                        <article class="w-full md:w-2/5">
+                            <h2 class="font-bold">Sign out Redirect URIs</h2>
+                            <p class="text-sm text-gray-500 max-w-70 mt-4">
+                                Allowed URIs which this app can redirect the user back to after logout.
+                            </p>
+                        </article>
+                        <div class="w-full md:w-3/5">
+                            <p class="text-xs text-gray-500 mb-2">You can add this later.</p>
+                            <x-shared.repeater-input model="form.signOutUris" :items="$form->signOutUris"/>
+                        </div>
                     </div>
-                </div>
-                <!-- Sign-out uris end -->
-
+                    <!-- Sign-out uris end -->
+                @endif
                 <!-- Access start -->
                 <hr>
                 <div class="flex gap-4 flex-col w-full md:flex-row">