diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 7145e21965..35173fd3d3 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -84,6 +84,7 @@ OC.Lostpassword = {
 		}
 		if($('#encrypted-continue').attr('checked')) {
 			$('#reset-password #submit').hide();
+			$('#reset-password #float-spinner').removeClass('hidden');
 		}
 	},
 
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index ebd7bff266..bac8b5c75c 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -13,5 +13,6 @@ script('core', 'lostpassword');
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 		<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
+		<img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
 	</fieldset>
 </form>