diff --git a/src/user/data.js b/src/user/data.js
index 66fedbefcd..9b8c0e93d1 100644
--- a/src/user/data.js
+++ b/src/user/data.js
@@ -55,6 +55,16 @@ module.exports = function(User) {
 				return callback(err);
 			}
 
+			if (fields.indexOf('banned') !== -1) {
+				// Also retrieve ban expiry for these users
+				db.sortedSetScores('users:banned:expire', uids, function(err, scores) {
+					users = users.map(function(userObj, idx) {
+						userObj.banned_until = scores[idx] || 0;
+						userObj.banned_until_readable = scores[idx] ? new Date(scores[idx]).toISOString() : 'Not Banned';
+					});
+				});
+			}
+
 			modifyUserData(users, fieldsToRemove, callback);
 		});
 	};
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 10db5a5dd6..6683f6e887 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -72,7 +72,7 @@
 								<!-- ENDIF !users.email:confirmed -->
 								<!-- ENDIF config.requireEmailConfirmation -->
 								<span class="administrator label label-primary <!-- IF !users.administrator -->hide<!-- ENDIF !users.administrator -->">Admin</span>
-								<span class="ban label label-danger <!-- IF !users.banned -->hide<!-- ENDIF !users.banned -->">Banned</span>
+								<span class="ban label label-danger <!-- IF !users.banned -->hide<!-- ENDIF !users.banned -->">Banned<!-- IF users.banned_until --> <i class="fa fa-clock-o" title="Banned until {../banned_until_readable}"></i><!-- ENDIF users.banned_until --></span>
 							</div>
 						</div>