diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index ffbc17568a01..c4672954124d 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -162,25 +162,26 @@ class AccountApiController extends BaseAPIController
 
         $devices = json_decode($account->devices, TRUE);
 
-        if(count($devices)<1)
-            return $this->errorResponse(['message'=>'no devices exist'], 400);
+        if(count($devices) < 1)
+            return $this->errorResponse(['message'=>'No registered devices.'], 400);
 
         for($x=0; $x<count($devices); $x++)
         {
             if($devices[$x]['email'] == Auth::user()->username)
             {
-                unset($devices[$x]);
 
                 $newDevice = [
-                    'token' => $request->token,
-                    'email' => $request->email,
-                    'device' => $request->device,
+                    'token' => $devices[$x]['token'],
+                    'email' => $devices[$x]['email'],
+                    'device' => $devices[$x]['device'],
                     'notify_sent' => $request->notify_sent,
                     'notify_viewed' => $request->notify_viewed,
                     'notify_approved' => $request->notify_approved,
                     'notify_paid' => $request->notify_paid,
                 ];
 
+                unset($devices[$x]);
+
                 $devices[] = $newDevice;
                 $account->devices = json_encode($devices);
                 $account->save();
diff --git a/app/Services/PushService.php b/app/Services/PushService.php
index e8d1176aebf8..17151f93af3f 100644
--- a/app/Services/PushService.php
+++ b/app/Services/PushService.php
@@ -129,9 +129,9 @@ class PushService
     private function entitySentMessage($invoice)
     {
         if($invoice->is_quote)
-            return "Quote #{$invoice->invoice_number} sent!";
+            return trans("texts.notification_quote_sent_subject", ['invoice' => $invoice->invoice_number, 'client' => $invoice->client->name]);
         else
-            return "Invoice #{$invoice->invoice_number} sent";
+            return trans("texts.notification_invoice_sent_subject", ['invoice' => $invoice->invoice_number, 'client' => $invoice->client->name]);
 
     }
 
@@ -141,7 +141,7 @@ class PushService
      */
     private function invoicePaidMessage($invoice)
     {
-        return "Invoice #{$invoice->invoice_number} paid!";
+        return trans("texts.notification_invoice_paid_subject", ['invoice' => $invoice->invoice_number, 'client' => $invoice->client->name]);
     }
 
     /**
@@ -150,7 +150,7 @@ class PushService
      */
     private function quoteApprovedMessage($invoice)
     {
-        return "Quote #{$invoice->invoice_number} approved!";
+        return trans("texts.notification_quote_approved_subject", ['invoice' => $invoice->invoice_number, 'client' => $invoice->client->name]);
     }
 
     /**
@@ -160,9 +160,9 @@ class PushService
     private function entityViewedMessage($invoice)
     {
         if($invoice->is_quote)
-            return "Quote #{$invoice->invoice_number} viewed!";
+            return trans("texts.notification_quote_viewed_subject", ['invoice' => $invoice->invoice_number, 'client' => $invoice->client->name]);
         else
-            return "Invoice #{$invoice->invoice_number} viewed!";
+            return trans("texts.notification_invoice_viewed_subject", ['invoice' => $invoice->invoice_number, 'client' => $invoice->client->name]);
 
     }