diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d649374f15..c5009f5f932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Craft CMS Changelog
 ### Fixed
 - Fixed a bug where emails that had inner-word underscores would get converted to `<em>` tags if a HTML body was not provided in the email.
 - Fixed a bug where the author of a draft could not delete their own draft if they did not have “Publish Live Changes” permissions.
+- Fixed a bug where the edit user page could give a Twig error when viewing a locked user account under certain circumstances.
 
 ## 2.6.2985 - 2017-06-27
 
diff --git a/src/templates/users/_edit.html b/src/templates/users/_edit.html
index d989077029e..0e116428cf9 100644
--- a/src/templates/users/_edit.html
+++ b/src/templates/users/_edit.html
@@ -275,10 +275,10 @@ <h5 class="heading">{{ "Account Status"|t }}</h5>
 						</div>
 					</div>
 
-					{% if account.status == 'locked' and craft.config.cooldownDuration %}
+					{% if account.status == 'locked' and craft.config.cooldownDuration and account.remainingCooldownTime %}
 						<div class="data">
 							<h5 class="heading">{{ "Cooldown Time Remaining"|t }}</h5>
-							<p class="value">{{ account.remainingCooldownTime.humanDuration }}</p>
+							<p class="value">{{ account.remainingCooldownTime.humanDuration() }}</p>
 						</div>
 					{% endif %}