diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 8e675a59856e..8bbadd0f1c2b 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -520,7 +520,7 @@
                 'expenses',
                 'vendors',
                 'settings',
-                'self-update'
+                //'self-update'
             ] as $option)
             <li class="{{ Request::is("{$option}*") ? 'active' : '' }}">
                 @if ($option == 'settings')
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 656536650ba5..45f844ef60c4 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -209,7 +209,7 @@
             <div class="form-group" style="margin-bottom: 8px">
                 <div class="col-lg-8 col-sm-8 col-sm-offset-4" style="padding-top: 10px">
                 	@if ($invoice->recurring_invoice)
-                        {!! trans('texts.created_by_invoice', ['invoice' => link_to('/invoices/'.$invoice->recurring_invoice->public_id, trans('texts.recurring_invoice'))]) !!}
+                        {!! trans('texts.created_by_invoice', ['invoice' => link_to('/invoices/'.$invoice->recurring_invoice->public_id, trans('texts.recurring_invoice'), ['id' => 'recurringInvoiceLink'])]) !!}
     				@elseif ($invoice->id)
                         <span class="smaller">
                         @if (isset($lastSent) && $lastSent)
diff --git a/tests/acceptance/InvoiceCest.php b/tests/acceptance/InvoiceCest.php
index bdddb5a05722..985ebcfa58ef 100644
--- a/tests/acceptance/InvoiceCest.php
+++ b/tests/acceptance/InvoiceCest.php
@@ -102,7 +102,7 @@ class InvoiceCest
         $I->see($clientEmail);
 
         $invoiceNumber = $I->grabAttributeFrom('#invoice_number', 'value');
-        $I->click('Recurring Invoice');
+        $I->click('#recurringInvoiceLink');
         $I->see($clientEmail);
 
         $I->click('#lastSent');