From 3c1084ffe065282273d0b8d2d75c8014fee9e265 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 8 Mar 2016 20:38:28 +0200
Subject: [PATCH] Minor fixes

---
 app/Ninja/Mailers/ContactMailer.php    | 3 +--
 resources/views/clients/edit.blade.php | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index b6d5184627cf..92ddee7ec3e9 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -298,7 +298,6 @@ class ContactMailer extends Mailer
         $includesPasswordPlaceholder = strpos($template, '$password') !== false;
                 
         $str = str_replace(array_keys($variables), array_values($variables), $template);
-        $str = autolink($str, 100);
 
         if(!$includesPasswordPlaceholder && $passwordHTML){
             $pos = strrpos($str, '$password');
@@ -308,7 +307,7 @@ class ContactMailer extends Mailer
             }
         }        
         $str = str_replace('$password', '', $str);
-
+        $str = autolink($str, 100);
         
         return $str;
     }
diff --git a/resources/views/clients/edit.blade.php b/resources/views/clients/edit.blade.php
index dd4b28273430..1dc84ccd7723 100644
--- a/resources/views/clients/edit.blade.php
+++ b/resources/views/clients/edit.blade.php
@@ -169,6 +169,7 @@
 		self.last_name = ko.observable('');
 		self.email = ko.observable('');
 		self.phone = ko.observable('');
+		self.password = ko.observable('');
 
 		if (data) {
 			ko.mapping.fromJS(data, {}, this);