diff --git a/settings/personal.php b/settings/personal.php
index a1fcd10e0a..a4449754f6 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -158,6 +158,7 @@ $userData = $accountManager->getUser($user);
 
 $tmpl->assign('total_space', $totalSpace);
 $tmpl->assign('usage_relative', $storageInfo['relative']);
+$tmpl->assign('quota', $storageInfo['quota']);
 $tmpl->assign('clients', $clients);
 $tmpl->assign('email', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['value']);
 $tmpl->assign('languages', $languages);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 31aa268f77..b47e2e28ff 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -28,8 +28,13 @@
 	<div style="width:<?php p($_['usage_relative']);?>%"
 		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
-			<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-			array($_['usage'], $_['total_space'])));?>
+			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
+				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
+					[$_['usage'], $_['total_space']]));?>
+			<?php else: ?>
+				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+			<?php endif ?>
 		</p>
 	</div>
 </div>