diff --git a/resources/views/partials/sign_up.blade.php b/resources/views/partials/sign_up.blade.php
index b09954a49755..5be8c4f583d7 100644
--- a/resources/views/partials/sign_up.blade.php
+++ b/resources/views/partials/sign_up.blade.php
@@ -160,7 +160,7 @@
       <div class="panel-body">
 
       <div id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)">
-        {!! Former::open('signup/submit')->addClass('signUpForm')->autocomplete('on') !!}
+        {!! Former::open('signup/submit')->addClass('signUpForm')->autocomplete('off') !!}
 
         @if (Auth::check() && ! Auth::user()->registered)
             {!! Former::populateField('new_first_name', Auth::user()->first_name) !!}
@@ -222,6 +222,7 @@
                         ->label(' ') !!}
                 {!! Former::password('new_password')
                         ->placeholder(trans('texts.password'))
+                        ->autocomplete('new-password')
                         ->label(' ') !!}
 
                 {{ Former::setOption('TwitterBootstrap3.labelWidths.large', 4) }}
diff --git a/resources/views/users/account_management.blade.php b/resources/views/users/account_management.blade.php
index ae04e3a6d9ba..614f5120e2e7 100644
--- a/resources/views/users/account_management.blade.php
+++ b/resources/views/users/account_management.blade.php
@@ -37,7 +37,7 @@
                         @if ($account->user_id == Auth::user()->id)
                             <b>{{ trans('texts.logged_in')}}</b>
                         @else
-                            {!! Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) !!}
+                            {{-- Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) --}}
                         @endif
                     </td>
                 </tr>
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index cbc79920316f..ffaed0b5b7d2 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -46,14 +46,14 @@ class AcceptanceTester extends \Codeception\Actor
     function selectDropdown(\AcceptanceTester $I, $option, $dropdownSelector)
     {
         $I->click($dropdownSelector);
-        $I->click(sprintf('ul.typeahead li[data-value="%s"]', $option));
+        $I->click(sprintf('ul.typeahead li[data-value*="%s"]', $option));
     }
 
     function selectDropdownCreate(\AcceptanceTester $I, $entityType, $value, $entityTypeShort = false)
     {
         $entityTypeShort = $entityTypeShort ?: $entityType;
         $I->fillField("#{$entityType}_name", $value);
-        $I->click(sprintf('ul.typeahead li[data-value="%s"]', "Create {$entityTypeShort}: \$name"));
+        $I->click(sprintf('ul.typeahead li[data-value*="%s"]', "Create {$entityTypeShort}: \$name"));
     }
 
     function selectDropdownRow(\AcceptanceTester $I, $option, $dropdownSelector)
diff --git a/tests/acceptance/GatewayFeesCest.php b/tests/acceptance/GatewayFeesCest.php
index c980ab3b5018..0306ee69b644 100644
--- a/tests/acceptance/GatewayFeesCest.php
+++ b/tests/acceptance/GatewayFeesCest.php
@@ -61,7 +61,7 @@ class GatewayFeesCest
         $invoicePublicId = $I->grabFromDatabase('invoices', 'public_id', ['id' => $invoiceId]);
         $I->amOnPage('/invoices/' . $invoicePublicId . '/edit');
         $I->click('Save Invoice');
-        $I->wait(2);
+        $I->wait(3);
         $I->see('Successfully updated invoice');
         $this->createPayment($I, $invitationKey, $total + $partialFeeWithTax, 0, $partialFeeWithTax);
     }
@@ -136,8 +136,8 @@ class GatewayFeesCest
         //$I->see($invoiceNumber);
         //$I->see('Successfully created invoice');
 
-        //$clientId = $I->grabFromDatabase('contacts', 'client_id', ['email' => $clientEmail]);
-        $clientId = $I->grabFromDatabase('clients', 'id', ['name' => $clientEmail]);
+        $clientId = $I->grabFromDatabase('contacts', 'client_id', ['email' => $clientEmail]);
+        //$clientId = $I->grabFromDatabase('clients', 'id', ['name' => $clientEmail]);
         $invoiceId = $I->grabFromDatabase('invoices', 'id', ['client_id' => $clientId, 'invoice_number' => $invoiceNumber]);
         $invitationKey = $I->grabFromDatabase('invitations', 'invitation_key', ['invoice_id' => $invoiceId]);