diff --git a/src/Controller/LingotekSetupController.php b/src/Controller/LingotekSetupController.php
index f632a27..48cb7de 100644
--- a/src/Controller/LingotekSetupController.php
+++ b/src/Controller/LingotekSetupController.php
@@ -70,6 +70,10 @@ class LingotekSetupController extends LingotekControllerBase {
       $this->L->set('default.project', current(array_keys($resources['project'])));
       $this->L->set('default.vault', current(array_keys($resources['vault'])));
       $this->L->set('default.workflow', array_search('Machine Translation', $resources['workflow']));
+      // Assign the project callback
+      $new_callback_url = \Drupal::urlGenerator()->generate('<none>', [], ['absolute' => TRUE]) . 'lingotek/notify';
+      $this->L->set('account.callback_url', $new_callback_url);
+      $new_response = $this->L->setProjectCallBackUrl($this->L->get('default.project'), $new_callback_url);
       return $this->redirect('lingotek.dashboard');
     }
     return array(
diff --git a/src/Form/LingotekSettingsDefaultsForm.php b/src/Form/LingotekSettingsDefaultsForm.php
index cb8d5fe..354e317 100644
--- a/src/Form/LingotekSettingsDefaultsForm.php
+++ b/src/Form/LingotekSettingsDefaultsForm.php
@@ -78,26 +78,12 @@ class LingotekSettingsDefaultsForm extends LingotekConfigFormBase {
       $this->L->set('default.'. $key, $form_values[$key]);
     }
 
-    $this->checkCallBackUrl();
+    // Since the lingotek module is newly installed, assign the callback
+    $new_callback_url = \Drupal::urlGenerator()->generate('<none>', [], ['absolute' => TRUE]) . 'lingotek/notify';
+    $this->L->set('account.callback_url', $new_callback_url);
+    $new_response = $this->L->setProjectCallBackUrl($this->L->get('default.project'), $new_callback_url);
     $form_state->setRedirect('lingotek.dashboard');
     parent::submitForm($form, $form_state);
   }
-
-  protected function checkCallBackUrl() {
-    $project_id = $this->L->get('default.project');
-    $response = $this->L->getProject($project_id);
-    $callback_url = $response['properties']['callback_url'];
-
-    // Assign a callback_url if the user's project doesn't have one
-    if ($callback_url) {
-      $this->L->set('account.callback_url', $callback_url);
-    }
-    elseif (!$callback_url) {
-      $new_callback_url = \Drupal::urlGenerator()->generate('<none>', [], ['absolute' => TRUE]) . 'lingotek/notify';
-      $this->L->set('account.callback_url', $new_callback_url);
-      $response['properties']['callback_url'] = $new_callback_url;
-      $new_response = $this->L->setProjectCallBackUrl($project_id, $new_callback_url);
-    }
-  }
-
+   
 }
diff --git a/src/Form/LingotekSettingsTabUtilitiesForm.php b/src/Form/LingotekSettingsTabUtilitiesForm.php
index 1a6eae1..4d4aedb 100644
--- a/src/Form/LingotekSettingsTabUtilitiesForm.php
+++ b/src/Form/LingotekSettingsTabUtilitiesForm.php
@@ -185,8 +185,11 @@ class LingotekSettingsTabUtilitiesForm extends LingotekConfigFormBase {
   public function updateCallbackUrl() {
     $new_callback_url = \Drupal::urlGenerator()->generate('<none>', [], ['absolute' => TRUE]) . 'lingotek/notify';
     $this->L->set('account.callback_url', $new_callback_url);
-    dpm($this->L->get());
     $new_response = $this->L->setProjectCallBackUrl($this->L->get('default.project'), $new_callback_url);
+    
+    if ($new_response) {
+      drupal_set_message($this->t('The callback URL has been updated.'));
+    }
   }
 
   public function runSelectedUtilities(array &$form, FormStateInterface $form_state) {