diff --git a/package-lock.json b/package-lock.json
index 1587fdbdda34..bcecc3b632dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4481,6 +4481,7 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
 			"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+			"optional": true,
 			"requires": {
 				"prr": "1.0.1"
 			}
@@ -9490,7 +9491,8 @@
 		"natives": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
-			"integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg=="
+			"integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
+			"optional": true
 		},
 		"natural-compare": {
 			"version": "1.4.0",
@@ -11222,7 +11224,8 @@
 		"prr": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+			"optional": true
 		},
 		"pseudomap": {
 			"version": "1.0.2",
diff --git a/packages/rocketchat-livechat/.app/client/lib/_livechat.js b/packages/rocketchat-livechat/.app/client/lib/_livechat.js
index 541af4c2a826..13aae330ea16 100644
--- a/packages/rocketchat-livechat/.app/client/lib/_livechat.js
+++ b/packages/rocketchat-livechat/.app/client/lib/_livechat.js
@@ -34,6 +34,9 @@ this.Livechat = new (class Livechat {
 
 		this.stream = new Meteor.Streamer('livechat-room');
 
+		this._guestName = new ReactiveVar();
+		this._guestEmail = new ReactiveVar();
+
 		Tracker.autorun(() => {
 			if (this._room.get() && visitor.getId()) {
 				RoomHistoryManager.getMoreIfIsEmpty(this._room.get());
@@ -121,6 +124,12 @@ this.Livechat = new (class Livechat {
 	get agent() {
 		return this._agent.get();
 	}
+	get guestName() {
+		return this._guestName.get();
+	}
+	get guestEmail() {
+		return this._guestEmail.get();
+	}
 
 	set online(value) {
 		this._online.set(value);
@@ -198,6 +207,12 @@ this.Livechat = new (class Livechat {
 	set agent(agentData) {
 		this._agent.set(agentData);
 	}
+	set guestName(name) {
+		return this._guestName.set(name);
+	}
+	set guestEmail(email) {
+		return this._guestEmail.set(email);
+	}
 
 	ready() {
 		this._ready.set(true);
diff --git a/packages/rocketchat-livechat/.app/client/lib/chatMessages.js b/packages/rocketchat-livechat/.app/client/lib/chatMessages.js
index 245e998e5e98..6797cace30df 100644
--- a/packages/rocketchat-livechat/.app/client/lib/chatMessages.js
+++ b/packages/rocketchat-livechat/.app/client/lib/chatMessages.js
@@ -148,6 +148,14 @@ this.ChatMessages = class ChatMessages {
 				guest.department = Livechat.department;
 			}
 
+			if (Livechat.guestName) {
+				guest.name = Livechat.guestName;
+			}
+
+			if (Livechat.guestEmail) {
+				guest.email = Livechat.guestEmail;
+			}
+			
 			Meteor.call('livechat:registerGuest', guest, (error, result) => {
 				if (error) {
 					return showError(error.reason);
diff --git a/packages/rocketchat-livechat/.app/client/lib/hooks.js b/packages/rocketchat-livechat/.app/client/lib/hooks.js
index 89436156dc19..93ba1a6f11c6 100644
--- a/packages/rocketchat-livechat/.app/client/lib/hooks.js
+++ b/packages/rocketchat-livechat/.app/client/lib/hooks.js
@@ -37,6 +37,34 @@ const api = {
 
 	widgetClosed() {
 		Livechat.setWidgetClosed();
+	},
+
+	setGuestToken(token) {
+		visitor.setToken(token);
+	},
+
+	setGuestName(name) {
+		visitor.setName(name);
+	},
+
+	setGuestEmail(email) {
+		visitor.setEmail(email);
+	},
+
+	registerGuest(data) {
+		if (typeof data !== 'object') {
+			return;
+		}
+
+		if (!data.token) {
+			data.token = Random.id();
+		}
+
+		Meteor.call('livechat:registerGuest', data, function(error, result) {
+			if (!error && result.visitor && result.visitor.token) {
+				visitor.setToken(result.visitor.token);
+			}
+		});
 	}
 };
 
diff --git a/packages/rocketchat-livechat/.app/client/lib/msgTyping.js b/packages/rocketchat-livechat/.app/client/lib/msgTyping.js
index 378af82a34aa..addcfa608ef4 100644
--- a/packages/rocketchat-livechat/.app/client/lib/msgTyping.js
+++ b/packages/rocketchat-livechat/.app/client/lib/msgTyping.js
@@ -10,6 +10,7 @@ export const MsgTyping = (function() {
 	const selfTyping = new ReactiveVar(false);
 	const usersTyping = {};
 	const dep = new Tracker.Dependency;
+	let oldRoom;
 
 	const addStream = function(room) {
 		if (!_.isEmpty(usersTyping[room] && usersTyping[room].users)) {
@@ -38,7 +39,11 @@ export const MsgTyping = (function() {
 
 	Tracker.autorun(() => {
 		if (visitor.getRoom() && visitor.getId()) {
+			if (oldRoom) {
+				Notifications.unRoom(oldRoom, 'typing');
+			}
 			addStream(visitor.getRoom());
+			oldRoom = visitor.getRoom();
 		}
 	});
 
diff --git a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js
index 414bd2cdf9a1..07aaa0912f9c 100644
--- a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js
+++ b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js
@@ -4,7 +4,7 @@ import visitor from '../../imports/client/visitor';
 function showDepartments() {
 	return Department.find({ showOnRegistration: true }).count() > 1;
 };
- 
+
 Template.livechatWindow.helpers({
 	title() {
 		return Livechat.title;
@@ -90,11 +90,20 @@ Template.livechatWindow.onCreated(function() {
 		return lng;
 	};
 
-	// get all needed live chat info for the user
-	Meteor.call('livechat:getInitialData', visitor.getToken(), (err, result) => {
-		if (err) {
-			console.error(err);
-		} else {
+	const loadDepartments = departments => {
+		Department.remove({});
+		departments.forEach((department) => {
+			Department.insert(department);
+		});
+	};
+
+	this.autorun(() => {
+		// get all needed live chat info for the user
+		Meteor.call('livechat:getInitialData', visitor.getToken(), (err, result) => {
+			if (err) {
+				return console.error(err);
+			}
+
 			if (!result.enabled) {
 				Triggers.setDisabled();
 				return parentCall('removeWidget');
@@ -129,6 +138,14 @@ Template.livechatWindow.onCreated(function() {
 
 			if (result.visitor) {
 				visitor.setData(result.visitor);
+
+				if (visitor.name) {
+					Livechat.guestName = visitor.name;
+				}
+
+				if (visitor.visitorEmails && visitor.visitorEmails.length > 0) {
+					Livechat.guestEmail = visitor.visitorEmails[0].address;
+				}
 			}
 
 			if (result.agentData) {
@@ -146,13 +163,12 @@ Template.livechatWindow.onCreated(function() {
 			Triggers.setTriggers(result.triggers);
 			Triggers.init();
 
-			result.departments.forEach((department) => {
-				Department.insert(department);
-			});
+			loadDepartments(result.departments);
+
 			Livechat.allowSwitchingDepartments = result.allowSwitchingDepartments;
 
 			Livechat.ready();
-		}
+		});
 	});
 
 	$(window).on('focus', () => {
diff --git a/packages/rocketchat-livechat/.app/client/views/register.html b/packages/rocketchat-livechat/.app/client/views/register.html
index 142ca7637593..1e3e533b7e34 100644
--- a/packages/rocketchat-livechat/.app/client/views/register.html
+++ b/packages/rocketchat-livechat/.app/client/views/register.html
@@ -9,11 +9,11 @@
 		</p>
 		<form id="livechat-registration">
 			{{#if showNameFieldRegisterForm}}
-				<input type="text" name="name" id="guestName" placeholder="{{_ "Name"}}">
-			{{/if}}	
+				<input type="text" name="name" id="guestName" placeholder="{{_ "Name"}}" value={{getName}}>
+			{{/if}}
 			{{#if showEmailFieldRegisterForm}}
-				<input type="email" name="email" id="guestEmail" placeholder="{{_ "Email"}}">
-			{{/if}}	
+				<input type="email" name="email" id="guestEmail" placeholder="{{_ "Email"}}" value={{getEmail}}>
+			{{/if}}
 			{{#if showDepartments}}
 				<select name="department">
 					<option value="">{{_ "Select_a_department"}}</option>
diff --git a/packages/rocketchat-livechat/.app/client/views/register.js b/packages/rocketchat-livechat/.app/client/views/register.js
index df4d27ace9a8..4139fb1c5c63 100644
--- a/packages/rocketchat-livechat/.app/client/views/register.js
+++ b/packages/rocketchat-livechat/.app/client/views/register.js
@@ -27,7 +27,13 @@ Template.register.helpers({
 	},
 	showEmailFieldRegisterForm() {
 		return Livechat.emailFieldRegistrationForm;
-	}	
+	},
+	getName() {
+		return Livechat.guestName;
+	},
+	getEmail() {
+		return Livechat.guestEmail;
+	}
 });
 
 Template.register.events({
@@ -41,10 +47,10 @@ Template.register.events({
 			}
 		};
 		const form = e.currentTarget;
-		
+
 		const fields = [];
-		let name;
-		let email;
+		let name = Livechat.guestName;
+		let email = Livechat.guestEmail;
 
 		if (Livechat.nameFieldRegistrationForm) {
 			fields.push('name');
@@ -106,7 +112,7 @@ Template.register.onCreated(function() {
 
 		return valid;
 	};
-	
+
 	this.showError = (msg) => {
 		$('.error').addClass('show');
 		this.error.set(msg);
diff --git a/packages/rocketchat-livechat/.app/imports/client/visitor.js b/packages/rocketchat-livechat/.app/imports/client/visitor.js
index 76bd78956f18..6839df3b35f9 100644
--- a/packages/rocketchat-livechat/.app/imports/client/visitor.js
+++ b/packages/rocketchat-livechat/.app/imports/client/visitor.js
@@ -1,4 +1,4 @@
-/* globals Commands */
+/* globals Commands, Livechat */
 const msgStream = new Meteor.Streamer('room-messages');
 
 export default {
@@ -18,6 +18,23 @@ export default {
 		this.token.set(localStorage.getItem('visitorToken'));
 	},
 
+	reset() {
+		msgStream.unsubscribe(this.roomSubscribed);
+
+		this.id.set(null);
+		this.token.set(null);
+		this.room.set(null);
+		this.data.set(null);
+		this.roomToSubscribe.set(null);
+		this.roomSubscribed = null;
+
+		Livechat.room = null;
+		Livechat.department = null;
+		Livechat.agent = null;
+		Livechat.guestName = null;
+		Livechat.guestEmail = null;
+	},
+
 	getId() {
 		return this.id.get();
 	},
@@ -38,6 +55,59 @@ export default {
 		return this.token.get();
 	},
 
+	setToken(token) {
+		if (!token || token == this.token.get()) {
+			return;
+		}
+
+		this.reset();
+
+		localStorage.setItem('visitorToken', token);
+		this.token.set(token);
+
+		Meteor.call('livechat:loginByToken', token, (err, result) => {
+
+			if (!result) {
+				return;
+			}
+
+			if (result._id) {
+				this.setId(result._id);
+				return result._id;
+			}
+		});
+	},
+
+	setName(name) {
+		Livechat.guestName = name;
+
+		if (!this.getId()) {
+			return;
+		}
+
+		const data = {
+			token: this.getToken(),
+			name
+		};
+
+		Meteor.call('livechat:registerGuest', data);
+	},
+
+	setEmail(email) {
+		Livechat.guestEmail = email;
+
+		if (!this.getId()) {
+			return;
+		}
+
+		const data = {
+			token: this.getToken(),
+			email
+		};
+
+		Meteor.call('livechat:registerGuest', data);
+	},
+
 	setRoom(rid) {
 		this.room.set(rid);
 	},
diff --git a/packages/rocketchat-livechat/assets/rocket-livechat.js b/packages/rocketchat-livechat/assets/rocket-livechat.js
index d81d0ae304c6..fb4c58b3ed25 100644
--- a/packages/rocketchat-livechat/assets/rocket-livechat.js
+++ b/packages/rocketchat-livechat/assets/rocket-livechat.js
@@ -620,6 +620,22 @@
 		callHook('setDepartment', department);
 	};
 
+	var setGuestToken = function(token) {
+		callHook('setGuestToken', token);
+	};
+
+	var setGuestName = function(name) {
+		callHook('setGuestName', name);
+	};
+
+	var setGuestEmail = function(email) {
+		callHook('setGuestEmail', email);
+	};
+
+	var registerGuest = function(guest) {
+		callHook('registerGuest', guest);
+	};
+
 	var clearDepartment = function() {
 		callHook('clearDepartment');
 	};
@@ -722,6 +738,10 @@
 		setTheme: setTheme,
 		setDepartment: setDepartment,
 		clearDepartment: clearDepartment,
+		setGuestToken: setGuestToken,
+		setGuestName: setGuestName,
+		setGuestEmail: setGuestEmail,
+		registerGuest: registerGuest,
 
 		// callbacks
 		onChatMaximized: function(fn) { registerCallback('chat-maximized', fn); },
diff --git a/packages/rocketchat-livechat/server/methods/loginByToken.js b/packages/rocketchat-livechat/server/methods/loginByToken.js
index 577bceb6c9f7..e2a0f852ee61 100644
--- a/packages/rocketchat-livechat/server/methods/loginByToken.js
+++ b/packages/rocketchat-livechat/server/methods/loginByToken.js
@@ -2,14 +2,14 @@ import LivechatVisitors from '../models/LivechatVisitors';
 
 Meteor.methods({
 	'livechat:loginByToken'(token) {
-		const user = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
+		const visitor = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
 
-		if (!user) {
+		if (!visitor) {
 			return;
 		}
 
 		return {
-			_id: user._id
+			_id: visitor._id
 		};
 	}
 });
diff --git a/packages/rocketchat-livechat/server/methods/registerGuest.js b/packages/rocketchat-livechat/server/methods/registerGuest.js
index ebad101c5d9b..c41a0f489a28 100644
--- a/packages/rocketchat-livechat/server/methods/registerGuest.js
+++ b/packages/rocketchat-livechat/server/methods/registerGuest.js
@@ -14,12 +14,19 @@ Meteor.methods({
 
 		const visitor = LivechatVisitors.getVisitorByToken(token, {
 			fields: {
+				token: 1,
 				name: 1,
 				username: 1,
 				visitorEmails: 1
 			}
 		});
 
+		//If it's updating an existing visitor, it must also update the roomInfo
+		const cursor = RocketChat.models.Rooms.findOpenByVisitorToken(token);
+		cursor.forEach((room) => {
+			RocketChat.Livechat.saveRoomInfo(room, visitor);
+		});
+
 		return {
 			userId,
 			visitor