diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php
index 43e38d2d5c..491e72e2a9 100644
--- a/lib/Form/Widget.php
+++ b/lib/Form/Widget.php
@@ -8,7 +8,6 @@ use \MailPoet\Models\Subscriber;
 use \MailPoet\Form\Renderer as FormRenderer;
 use \MailPoet\Form\Util;
 use \MailPoet\Util\Security;
-use \MailPoet\Util\Url;
 
 if(!defined('ABSPATH')) exit;
 
diff --git a/lib/Router/Endpoints/Subscription.php b/lib/Router/Endpoints/Subscription.php
index ed315d6882..04dfbf11fc 100644
--- a/lib/Router/Endpoints/Subscription.php
+++ b/lib/Router/Endpoints/Subscription.php
@@ -2,7 +2,6 @@
 namespace MailPoet\Router\Endpoints;
 
 use MailPoet\Subscription as UserSubscription;
-use MailPoet\Util\Url;
 
 if(!defined('ABSPATH')) exit;
 
diff --git a/lib/Subscription/Form.php b/lib/Subscription/Form.php
index a9779d4203..41353c3b6a 100644
--- a/lib/Subscription/Form.php
+++ b/lib/Subscription/Form.php
@@ -1,5 +1,7 @@
 <?php
 namespace MailPoet\Subscription;
+use \MailPoet\API\Endpoints\Subscribers;
+use \MailPoet\API\Response as APIResponse;
 use \MailPoet\Models\Subscriber;
 use \MailPoet\Models\StatisticsForms;
 use \MailPoet\Models\Form as FormModel;
@@ -13,54 +15,25 @@ class Form {
       'method',
       'mailpoet_redirect'
     );
+
     $data = array_diff_key($_POST, array_flip($reserved_keywords));
+    $form_id = isset($data['form_id']) ? $data['form_id'] : 0;
 
-    $form_id = (isset($data['form_id']) ? (int)$data['form_id'] : false);
-    $form = FormModel::findOne($form_id);
-    unset($data['form_id']);
+    $endpoint = new Subscribers();
 
-    $segment_ids = (!empty($data['segments'])
-      ? (array)$data['segments']
-      : array()
-    );
-    unset($data['segments']);
+    $response = $endpoint->subscribe($data);
 
-    if(empty($segment_ids)) {
+    if($response->status !== APIResponse::STATUS_OK) {
       Url::redirectBack(array(
-        'mailpoet_error' => $form_id,
-        'mailpoet_success' => null
-      ));
-    }
-
-    $subscriber = Subscriber::subscribe($data, $segment_ids);
-    $errors = $subscriber->getErrors();
-    if($errors !== false) {
-      Url::redirectBack(array(
-        'mailpoet_error' => $form_id,
+        'mailpoet_error' => isset($data['form_id']) ? $data['form_id'] : true,
         'mailpoet_success' => null
       ));
     } else {
-      $meta = array();
-
-      if($form !== false) {
-        // record form statistics
-        StatisticsForms::record($form->id, $subscriber->id);
-
-        $form = $form->asArray();
-
-        if($form['settings']['on_success'] === 'page') {
-          // redirect to a page on a success, pass the page url in the meta
-          $meta['redirect_url'] = get_permalink($form['settings']['success_page']);
-        } else if($form['settings']['on_success'] === 'url') {
-          $meta['redirect_url'] = $form['settings']['success_url'];
-        }
-      }
-
-      if(isset($meta['redirect_url'])) {
-        Url::redirectTo($meta['redirect_url']);
+      if(isset($response->meta['redirect_url'])) {
+        Url::redirectTo($response->meta['redirect_url']);
       } else {
         Url::redirectBack(array(
-          'mailpoet_success' => $form['id'],
+          'mailpoet_success' => $form_id,
           'mailpoet_error' => null
         ));
       }