diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index f7ec7670d2a9..25cc858e7500 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -126,7 +126,7 @@ class ImportController extends Controller
 
     private function getEntityMap($entity_type)
     {
-        return sprintf('App\\Import\\Definitions\%sMap', ucfirst($entity_type));
+        return sprintf('App\\Import\\Definitions\%sMap', ucfirst(Str::camel($entity_type)));
     }
 
     private function getCsvData($csvfile)
diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php
index 2e98774d1d0c..b08824ac6a42 100644
--- a/app/Http/Requests/User/UpdateUserRequest.php
+++ b/app/Http/Requests/User/UpdateUserRequest.php
@@ -14,6 +14,7 @@ namespace App\Http\Requests\User;
 use App\Http\Requests\Request;
 use App\Http\ValidationRules\UniqueUserRule;
 use App\Http\ValidationRules\User\HasValidPhoneNumber;
+use App\Utils\Ninja;
 
 class UpdateUserRequest extends Request
 {
@@ -64,7 +65,7 @@ class UpdateUserRequest extends Request
             $input['last_name'] = strip_tags($input['last_name']);
         }
 
-        if(strlen($input['phone']) > 1 && ($this->user->phone != $input['phone']))
+        if(array_key_exists('phone', $input) && strlen($input['phone']) > 1 && ($this->user->phone != $input['phone']))
             $this->phone_has_changed = true;
 
         $this->replace($input);