diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 62e3c9b0a36..dcfbcdd7d56 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -215,15 +215,13 @@ Template.room.helpers
 	flexUserInfo: ->
 		username = Session.get('showUserInfo')
 
-		userData = {
-			# name: Session.get('user_' + uid + '_name')
-			# emails: Session.get('user_' + uid + '_emails')
-			username: String(username)
-		}
-		# phone = Session.get('user_' + uid + '_phone')
-		# if phone? and phone[0]?.phoneNumber
-		# 	userData.phone = phone[0]?.phoneNumber
-
+		if Meteor.user()?.admin is true
+			userData = _.extend { username: String(username) }, Meteor.users.findOne { username: String(username) }
+		else
+			userData = {
+				username: String(username)
+			}
+		
 		return userData
 
 	seeAll: ->
@@ -272,6 +270,27 @@ Template.room.helpers
 	maxMessageLength: ->
 		return RocketChat.settings.get('Message_MaxAllowedSize')
 
+	isAdmin: ->
+		return Meteor.user()?.admin is true
+
+	utcOffset: ->
+		if @utcOffset?
+			if @utcOffset > 0
+				@utcOffset = "+#{@utcOffset}"
+
+			return "UTC #{@utcOffset}"
+	
+	phoneNumber: ->
+		return '' unless @phoneNumber
+		if @phoneNumber.length > 10
+			return "(#{@phoneNumber.substr(0,2)}) #{@phoneNumber.substr(2,5)}-#{@phoneNumber.substr(7)}"
+		else
+			return "(#{@phoneNumber.substr(0,2)}) #{@phoneNumber.substr(2,4)}-#{@phoneNumber.substr(6)}"
+	
+	lastLogin: ->
+		if @lastLogin
+			return moment(@lastLogin).format('LLL')
+
 
 Template.room.events
 
@@ -537,12 +556,36 @@ Template.room.events
 				unless error
 					toastr.success 'Upload succeeded!'
 
+	'click .deactivate': ->
+		username = Session.get('showUserInfo')
+		user = Meteor.users.findOne { username: String(username) }
+		Meteor.call 'setUserActiveStatus', user?._id, false, (error, result) ->
+			if result
+				toastr.success t('User_has_been_deactivated')
+			if error
+				toastr.error error.reason
+	
+	'click .activate': ->
+		username = Session.get('showUserInfo')
+		user = Meteor.users.findOne { username: String(username) }
+		Meteor.call 'setUserActiveStatus', user?._id, true, (error, result) ->
+			if result
+				toastr.success t('User_has_been_activated')
+			if error
+				toastr.error error.reason
+
 Template.room.onCreated ->
 	# this.scrollOnBottom = true
 	# this.typing = new msgTyping this.data._id
 	this.showUsersOffline = new ReactiveVar false
 	this.atBottom = true
 
+	# If current user is admin, subscribe to full user data
+	if Meteor.user()?.admin is true
+		Tracker.autorun ->
+			if Session.get('showUserInfo') and not Meteor.users.findOne Session.get 'showUserInfo'
+				Meteor.subscribe 'fullUsers', Session.get('showUserInfo'), 1
+
 Template.room.onRendered ->
 	FlexTab.check()
 	this.chatMessages = new ChatMessages
diff --git a/client/views/app/room.html b/client/views/app/room.html
index 149dcd11b9f..08ea7bbd67b 100644
--- a/client/views/app/room.html
+++ b/client/views/app/room.html
@@ -138,17 +138,13 @@
 									</div>
 									<div class="info">
 										<h3>{{username}}</h3>
-										{{#if contactCode}}
-											<div class="contact-code">{{_ "Contact"}} {{contactCode}}</div>
+										{{#if isAdmin}}
+											<p>{{name}}</p>
+											{{#if utcOffset}}<p><i class="icon-location"></i> {{utcOffset}}</p>{{/if}}
+											{{#each emails}} <p><i class="icon-mail"></i> {{address}}{{#if verified}}&nbsp;<i class="icon-ok"></i>{{/if}}</p> {{/each}}
+											{{#each phone}} <p><i class="icon-phone"></i> {{phoneNumber}}</p> {{/each}}
+											{{#if lastLogin}} <p><i class="icon-clock"></i> {{_ "Last_login"}}: {{lastLogin}}</p> {{/if}}
 										{{/if}}
-										{{!--
-										{{#each emails}}
-											<p><i class="icon-mail"></i> {{address}}</p>
-										{{/each}}
-										{{#if phone}}
-											<p><i class="icon-phone"></i> {{phone}}</p>
-										{{/if}}
-										--}}
 									</div>
 								</div>
 								<nav>
@@ -156,6 +152,13 @@
 									{{#if canDirectMessage}}
 									<button class='button pvt-msg'><span><i class='icon-chat'></i> {{_ "Conversation"}}</span></button>
 									{{/if}}
+									{{#if isAdmin}}
+										{{#if active}}
+										<button class='button deactivate'><span><i class='icon-block'></i> {{_ "Deactivate"}}</span></button>
+										{{else}}
+										<button class='button activate'><span><i class='icon-ok-circled'></i> {{_ "Activate"}}</span></button>
+										{{/if}}
+									{{/if}}
 								</nav>
 							{{/with}}
 						</div>
diff --git a/client/views/settings/settingsUsers.html b/client/views/settings/settingsUsers.html
index 3d03106b411..44c96678794 100644
--- a/client/views/settings/settingsUsers.html
+++ b/client/views/settings/settingsUsers.html
@@ -61,7 +61,7 @@
 								{{#if utcOffset}}<p><i class="icon-location"></i> {{utcOffset}}</p>{{/if}}
 								{{#each emails}} <p><i class="icon-mail"></i> {{address}}{{#if verified}}&nbsp;<i class="icon-ok"></i>{{/if}}</p> {{/each}}
 								{{#each phone}} <p><i class="icon-phone"></i> {{phoneNumber}}</p> {{/each}}
-								{{#if lastLogin}} <p><i class="icon-clock"></i> {{_ "Last_seen"}}: {{lastLogin}}</p> {{/if}}
+								{{#if lastLogin}} <p><i class="icon-clock"></i> {{_ "Last_login"}}: {{lastLogin}}</p> {{/if}}
 							</div>
 						</div>
 						<nav>
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 13b4ca8e907..12c688b8c92 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -84,7 +84,7 @@
   "Language" : "Language",
   "Language_Version" : "English Version",
   "Last_message" : "Last message",
-  "Last_seen" : "Last seen",
+  "Last_login" : "Last login",
   "Leave_room" : "Leave room",
   "line" : "line",
   "Load_more" : "Load more",
@@ -191,6 +191,8 @@
   "Use_uploaded_avatar" : "Use uploaded avatar",
   "User_added" : "User <em>__user_added__</em> added.",
   "User_added_by" : "User <em>__user_added__</em> added by <em>__user_by__</em>.",
+  "User_has_been_activated": "User has been activated",
+  "User_has_been_deactivated": "User has been deactivated",
   "User_joined_channel" : "Has joined the channel.",
   "User_joined_channel_male" : "Has joined the channel.",
   "User_joined_channel_female" : "Has joined the channel.",