From 72340845e56c3bf557c502f05e259e0b6d8502e0 Mon Sep 17 00:00:00 2001
From: Brandon Russell <russellbrandon1999@gmail.com>
Date: Sat, 19 Mar 2016 23:14:28 -0500
Subject: [PATCH] Add email and password if non-token login

---
 lib/Client/InternalClient.js | 21 ++++++++++-----------
 src/Client/InternalClient.js | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 3f90e1864..ed1173520 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -1219,19 +1219,18 @@ var InternalClient = (function () {
 	//def updateDetails
 
 	InternalClient.prototype.updateDetails = function updateDetails(data) {
-		if (!this.email && !data.email) {
-			return this.apiRequest("patch", _Constants.Endpoints.ME, true, {
-				avatar: this.resolver.resolveToBase64(data.avatar) || this.user.avatar,
-				username: data.username || this.user.username
-			});
-		}
-		return this.apiRequest("patch", _Constants.Endpoints.ME, true, {
+		var options = {
 			avatar: this.resolver.resolveToBase64(data.avatar) || this.user.avatar,
-			email: data.email || this.email,
-			new_password: data.newPassword || null,
-			password: data.password || this.password,
 			username: data.username || this.user.username
-		});
+		};
+
+		if (this.email || data.email) {
+			options.email = data.email || this.email;
+			options.new_password = data.newPassword || null;
+			options.password = data.password || this.password;
+		}
+
+		return this.apiRequest("patch", _Constants.Endpoints.ME, true, options);
 	};
 
 	//def setAvatar
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index cf2d72780..ee46f422a 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1005,19 +1005,18 @@ export default class InternalClient {
 
 	//def updateDetails
 	updateDetails(data) {
-		if (!this.email && !data.email) {
-			return this.apiRequest("patch", Endpoints.ME, true, {
-				avatar: this.resolver.resolveToBase64(data.avatar) || this.user.avatar,
-				username: data.username || this.user.username
-			});
-		}
-		return this.apiRequest("patch", Endpoints.ME, true, {
+		var options = {
 			avatar: this.resolver.resolveToBase64(data.avatar) || this.user.avatar,
-			email: data.email || this.email,
-			new_password: data.newPassword || null,
-			password: data.password || this.password,
 			username: data.username || this.user.username
-		});
+		}
+
+		if (this.email || data.email) {
+			options.email = data.email || this.email;
+			options.new_password = data.newPassword || null;
+			options.password = data.password || this.password;
+		}
+
+		return this.apiRequest("patch", Endpoints.ME, true, options);
 	}
 
 	//def setAvatar