diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index 5f34f267db7c..5154370651f1 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -132,7 +132,7 @@ class AccountApiController extends BaseAPIController
                     $devices[$x]['token'] = $request->token; //update
                     $account->devices = json_encode($devices);
                     $account->save();
-                    return $this->response($account);
+                    return $this->response($devices[$x]);
                 }
             }
 
diff --git a/app/Services/PushService.php b/app/Services/PushService.php
index 00591e263323..e8d1176aebf8 100644
--- a/app/Services/PushService.php
+++ b/app/Services/PushService.php
@@ -51,7 +51,7 @@ class PushService
         foreach($devices as $device)
         {
             if(($device["notify_{$type}"] == TRUE) && ($device['device'] == 'ios'))
-                $this->pushMessage($invoice, $device['token'], $device["notify_{$type}"]);
+                $this->pushMessage($invoice, $device['token'], $type);
         }
 
 
@@ -104,19 +104,19 @@ class PushService
     {
         switch($type)
         {
-            case 'notify_sent':
+            case 'sent':
                 return $this->entitySentMessage($invoice);
                 break;
 
-            case 'notify_paid':
+            case 'paid':
                 return $this->invoicePaidMessage($invoice);
                 break;
 
-            case 'notify_approved':
+            case 'approved':
                 return $this->quoteApprovedMessage($invoice);
                 break;
 
-            case 'notify_viewed':
+            case 'viewed':
                 return $this->entityViewedMessage($invoice);
                 break;
         }
@@ -129,9 +129,9 @@ class PushService
     private function entitySentMessage($invoice)
     {
         if($invoice->is_quote)
-            return 'Quote #{$invoice->invoice_number} sent!';
+            return "Quote #{$invoice->invoice_number} sent!";
         else
-            return 'Invoice #{$invoice->invoice_number} sent!';
+            return "Invoice #{$invoice->invoice_number} sent";
 
     }
 
@@ -141,7 +141,7 @@ class PushService
      */
     private function invoicePaidMessage($invoice)
     {
-        return 'Invoice #{$invoice->invoice_number} paid!';
+        return "Invoice #{$invoice->invoice_number} paid!";
     }
 
     /**
@@ -150,7 +150,7 @@ class PushService
      */
     private function quoteApprovedMessage($invoice)
     {
-        return 'Quote #{$invoice->invoice_number} approved!';
+        return "Quote #{$invoice->invoice_number} approved!";
     }
 
     /**
@@ -160,9 +160,9 @@ class PushService
     private function entityViewedMessage($invoice)
     {
         if($invoice->is_quote)
-            return 'Quote #{$invoice->invoice_number} viewed!';
+            return "Quote #{$invoice->invoice_number} viewed!";
         else
-            return 'Invoice #{$invoice->invoice_number} viewed!';
+            return "Invoice #{$invoice->invoice_number} viewed!";
 
     }