diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
index 8ac61b19..8a52882a 100644
--- a/app/Http/Controllers/SubscribeController.php
+++ b/app/Http/Controllers/SubscribeController.php
@@ -57,13 +57,13 @@ class SubscribeController extends Controller
         $subscriptions = Binput::get('subscriptions');
 
         try {
-            dispatch(new SubscribeSubscriberCommand($email, false, $subscriptions));
+            $subscription = dispatch(new SubscribeSubscriberCommand($email, false, $subscriptions));
         } catch (AlreadySubscribedException $e) {
-            return Redirect::route('subscribe.subscribe')
+            return Redirect::route('subscribe.manage', $subscription->id)
                 ->withTitle(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
                 ->withErrors(trans('cachet.subscriber.email.already-subscribed', ['email' => $email]));
         } catch (ValidationException $e) {
-            return Redirect::route('subscribe.subscribe')
+            return Redirect::route('status-page')
                 ->withInput(Binput::all())
                 ->withTitle(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
                 ->withErrors($e->getMessageBag());
diff --git a/resources/views/partials/component.blade.php b/resources/views/partials/component.blade.php
index 6d915ec9..d05bc6fc 100644
--- a/resources/views/partials/component.blade.php
+++ b/resources/views/partials/component.blade.php
@@ -9,10 +9,6 @@
     <i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i>
     @endif
 
-    @if(subscribers_enabled())
-    <a href="#" data-toggle="modal" data-target="#subscribe-modal" data-component-id="{{ $component->id }}"><i class="ion ion-ios-email-outline" data-toggle="tooltip" data-title="{{ trans('cachet.subscriber.email.component.tooltip-title', ['component_name' => $component->name]) }}" data-container="body"></i></a>
-    @endif
-
     <div class="pull-right">
         <small class="text-component-{{ $component->status }} {{ $component->status_color }}" data-toggle="tooltip" title="{{ trans('cachet.components.last_updated', ['timestamp' => $component->updated_at_formatted]) }}">{{ $component->human_status }}</small>
     </div>
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index 220f68ba..5219c620 100644
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -29,7 +29,7 @@
                     </li>
                     @if(subscribers_enabled())
                     <li>
-                        <a class="btn btn-success btn-outline" href="{{ route('subscribe.subscribe') }}">{{ trans('cachet.subscriber.button') }}</a>
+                        <a class="btn btn-success btn-outline" href="#" data-toggle="modal" data-target="#subscribe-modal">{{ trans('cachet.subscriber.button') }}</a>
                     </li>
                     @endif
                 </ul>
diff --git a/resources/views/partials/modals/subscribe.blade.php b/resources/views/partials/modals/subscribe.blade.php
index ab6aaab0..35cef74c 100644
--- a/resources/views/partials/modals/subscribe.blade.php
+++ b/resources/views/partials/modals/subscribe.blade.php
@@ -1,8 +1,7 @@
 <div class="modal fade" tabindex="-1" role="dialog" id="subscribe-modal">
     <div class="modal-dialog">
-        <form action="{{ route("subscribe.subscribe", [], false) }}" method="post" class="form">
+        <form action="{{ route("subscribe.subscribe") }}" method="post" class="form">
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
-            <input type="hidden" name="subscriptions[component_id]" id="subscribe-modal-id" value="">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>