diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
index 4203649b53..d03cac36c1 100644
--- a/settings/templates/users/part.setquota.php
+++ b/settings/templates/users/part.setquota.php
@@ -25,6 +25,11 @@
 		</select>
 	<?php endif; ?>
 	<?php if((bool) !$_['isAdmin']): ?>
-		: <?php p($_['default_quota']);?>
+		: 
+		<?php if( $_['default_quota']=="none"): ?>
+			<?php p($l->t('Unlimited'));?>
+		<?php else: ?>
+			<?php p($_['default_quota']);?>
+		<?php endif; ?>
 	<?php endif; ?>
 </div>