From edf59c7cb0fd39358b75e9af8387fab8caa6191a Mon Sep 17 00:00:00 2001
From: Awa Assahna <awa.assahna@andela.com>
Date: Sun, 18 Jun 2017 11:28:01 +0100
Subject: [PATCH 1/3] Update current user's name and profile when address is
 added

---
 server/methods/accounts/accounts.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/server/methods/accounts/accounts.js b/server/methods/accounts/accounts.js
index deabdd63f61..b53cf04692b 100644
--- a/server/methods/accounts/accounts.js
+++ b/server/methods/accounts/accounts.js
@@ -284,10 +284,20 @@ export function addressBookAdd(address, accountUserId) {
     }
   }
 
+  Meteor.users.upsert(Meteor.userId(), {
+    $set: {
+      name: address.fullName
+    },
+    $addToSet: {
+      "profile.addressBook": address
+    }
+  });
+
   return Accounts.upsert({
     userId: userId
   }, {
     $set: {
+      name: address.fullName,
       userId: userId
     },
     $addToSet: {

From 4a90233e6e18cf6ced54ab36f6fa06b4956c29e1 Mon Sep 17 00:00:00 2001
From: Awa Assahna <awa.assahna@andela.com>
Date: Tue, 20 Jun 2017 09:03:43 +0100
Subject: [PATCH 2/3] Update user's name when address is updated

---
 server/methods/accounts/accounts.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/methods/accounts/accounts.js b/server/methods/accounts/accounts.js
index b53cf04692b..c00d9478a6d 100644
--- a/server/methods/accounts/accounts.js
+++ b/server/methods/accounts/accounts.js
@@ -284,11 +284,9 @@ export function addressBookAdd(address, accountUserId) {
     }
   }
 
-  Meteor.users.upsert(Meteor.userId(), {
+  Meteor.users.update(Meteor.userId(), {
     $set: {
-      name: address.fullName
-    },
-    $addToSet: {
+      "name": address.fullName,
       "profile.addressBook": address
     }
   });
@@ -399,11 +397,19 @@ export function addressBookUpdate(address, accountUserId, type) {
     }
   }
 
+  Meteor.users.update(Meteor.userId(), {
+    $set: {
+      "name": address.fullName,
+      "profile.addressBook": address
+    }
+  });
+
   return Accounts.update({
     "userId": userId,
     "profile.addressBook._id": address._id
   }, {
     $set: {
+      "name": address.fullName,
       "profile.addressBook.$": address
     }
   });

From 368e294fa591e4662a79fee218457881d75419a8 Mon Sep 17 00:00:00 2001
From: Awa Assahna <awa.assahna@andela.com>
Date: Tue, 20 Jun 2017 23:36:28 +0100
Subject: [PATCH 3/3] Get correct admin user's name from env variables

---
 server/api/core/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/api/core/core.js b/server/api/core/core.js
index 7ef672d3c06..1b4cdc0445d 100644
--- a/server/api/core/core.js
+++ b/server/api/core/core.js
@@ -293,8 +293,8 @@ export default {
     // defaults use either env or generated values
     options.email = env.REACTION_EMAIL || defaultEmail;
     options.password = env.REACTION_AUTH || defaultPassword;
-    options.username = env.REACTION_USER || defaultUsername;
-    options.name = env.REACTION_USER_NAME || defaultName;
+    options.username = env.REACTION_USER_NAME || defaultUsername;
+    options.name = env.REACTION_USER || defaultName;
 
     // or use `meteor --settings`
     if (Meteor.settings && !configureEnv) {