diff --git a/src/status_im/ui/screens/profile/events.cljs b/src/status_im/ui/screens/profile/events.cljs
index 042d34b7fc..3b16713317 100644
--- a/src/status_im/ui/screens/profile/events.cljs
+++ b/src/status_im/ui/screens/profile/events.cljs
@@ -8,6 +8,8 @@
             [status-im.utils.image-processing :refer [img->base64]]
             [taoensso.timbre :as log]))
 
+(def account-profile-keys [:name :photo-path :status])
+
 (reg-fx
   :open-image-picker
   ;; the image picker is only used here for now, this effect can be use in other scenarios as well
@@ -40,8 +42,9 @@
   :my-profile/edit
   (fn [{:keys [db]} [_ edit-type edit-value]]
     (let [current-account-id (:accounts/current-account-id db)
-          current-account (select-keys (get-in db [:accounts/accounts current-account-id])
-                                       [:name :photo-path :status])
+          current-account (-> db
+                              (get-in [:accounts/accounts current-account-id])
+                              (select-keys account-profile-keys))
           new-db (-> db
                      (update-in [:my-profile/edit] merge current-account)
                      (assoc-in [:my-profile/edit :edit-status?] (= edit-type :status true)))]
@@ -75,4 +78,4 @@
   (fn [{:keys [db]} _]
     (let [{:keys [:my-profile/edit]} db]
       {:dispatch-n [[:check-status-change (:status edit)]
-                    [:account-update edit]]})))
+                    [:account-update (select-keys edit account-profile-keys)]]})))
diff --git a/test/cljs/status_im/test/profile/events.cljs b/test/cljs/status_im/test/profile/events.cljs
new file mode 100644
index 0000000000..d7307e63f9
--- /dev/null
+++ b/test/cljs/status_im/test/profile/events.cljs
@@ -0,0 +1,53 @@
+(ns status-im.test.profile.events
+  (:require [cljs.test :refer [deftest is testing]]
+            reagent.core
+            [re-frame.core :as rf]
+            [day8.re-frame.test :refer [run-test-sync]]
+            status-im.ui.screens.db
+            [status-im.ui.screens.events :as events]
+            [status-im.ui.screens.profile.events :as profile-events]
+            [status-im.ui.screens.accounts.events :as account-events]))
+
+(def new-account
+  {:address "c296367a939e0957500a25ca89b70bd64b03004e"
+   :signed-up? true
+   :name "Disloyal Trusting Rainbowfish"
+   :updates-private-key "3849071831f581f5e2a4f095a53e0a697144b32ea6de9e92cc08936f2efa40d2f1702bdb131356df0930a3a0d301221f2b5"
+   :updates-public-key "38453ecc298b8b35de00c85d3217f00aa7040a7d3053dbbf6831d03c750df40b27977906692b3b5d6fec8134706b2bf65900c61130047488520cb60080a59b118cb281f3aaf65ba704c7efde8f9357d2b22fe8110b38a4dd714c1c9e108a8b067fe"
+   :photo-path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAADAFBMVEXw8PDYjLoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG2YFqAAABAHRSTlP//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKmfXxgAABnNJREFUeNoBaAaX+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEAAAAAAAABAQEBAQEAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAEBAQEBAQAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAQEBAQEBAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAABAQEBAQEAAAAAAAABAQEBAQEAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAEBAQEBAQAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAQEBAQEBAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEBAQEBAQEBAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQEBAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEBAQEBAQEBAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQEBAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEBAQEBAQEBAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQEBAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEBAQEBAQEBAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQEBAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKUMBsXBa1BAAAAAASUVORK5CYII="
+   :status "the future starts today, not tomorrow"
+   :public-key "0x04f5722fba79eb36d73263417531007f43d13af76c6233573a8e3e60f667710611feba0785d751b50609bfc0b7cef35448875c5392c0a91948c95798a0ce600847"})
+
+
+(defn test-fixtures []
+  (rf/reg-fx ::events/init-store #())
+  (rf/reg-fx ::account-events/save-account #())
+  (rf/reg-fx :check-status-change #()))
+
+(deftest profile-edit-events
+  (run-test-sync
+   (test-fixtures)
+   (let [accounts (rf/subscribe [:get-accounts])
+         address (:address new-account)
+         new-status "It's a new status!"]
+     (rf/dispatch [:initialize-db])
+     (rf/dispatch [:add-account new-account])
+     (rf/dispatch [:set-current-account address])
+     (testing "Setting status"
+       (is (= (:status new-account) (-> @accounts
+                                       (get address)
+                                       :status)))
+      (rf/dispatch [:my-profile/update-status new-status])
+      (is (= new-status (-> @accounts
+                            (get address)
+                            :status))))
+     (testing "Setting phone number"
+       (is (nil? (-> @accounts
+                     (get address)
+                     :phone)))
+       (rf/dispatch [:set-in [:my-profile/edit :edit-status?] true])
+       (rf/dispatch [:set-in [:my-profile/edit :name] "It's my new name"])
+       (rf/dispatch [:my-profile/save-changes])
+       (is (= "It's my new name" (-> @accounts
+                                     (get address)
+                                     :name)))))))
diff --git a/test/cljs/status_im/test/runner.cljs b/test/cljs/status_im/test/runner.cljs
index 7d3a7a1142..3e09033a83 100644
--- a/test/cljs/status_im/test/runner.cljs
+++ b/test/cljs/status_im/test/runner.cljs
@@ -2,6 +2,7 @@
   (:require [doo.runner :refer-macros [doo-tests]]
             [status-im.test.contacts.events]
             [status-im.test.accounts.events]
+            [status-im.test.profile.events]
             [status-im.test.chat.models.input]
             [status-im.test.components.main-tabs]
             [status-im.test.handlers]
@@ -21,14 +22,15 @@
 (set! goog.DEBUG false)
 
 (doo-tests
-  'status-im.test.accounts.events
-  'status-im.test.contacts.events
-  'status-im.test.chat.models.input
-  'status-im.test.components.main-tabs
-  'status-im.test.handlers
-  'status-im.test.utils.utils
-  'status-im.test.utils.money
-  'status-im.test.utils.clocks
-  'status-im.test.utils.erc20
-  'status-im.test.utils.random
-  'status-im.test.utils.gfycat.core)
+ 'status-im.test.accounts.events
+ 'status-im.test.contacts.events
+ 'status-im.test.profile.events
+ 'status-im.test.chat.models.input
+ 'status-im.test.components.main-tabs
+ 'status-im.test.handlers
+ 'status-im.test.utils.utils
+ 'status-im.test.utils.money
+ 'status-im.test.utils.clocks
+ 'status-im.test.utils.erc20
+ 'status-im.test.utils.random
+ 'status-im.test.utils.gfycat.core)