From eccb33ab59694fa4481df11cdeee1496f23fd8ad Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 12 Apr 2017 17:05:03 +0300
Subject: [PATCH] Merge fixes

---
 resources/views/partials/sign_up.blade.php         | 3 ++-
 resources/views/users/account_management.blade.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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>