diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index 24593a04f5..b07d480d66 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -307,7 +307,7 @@
 			var _this = this;
 			this._toggleAddingToken(true);
 
-			var deviceName = this._tokenName.val();
+			var deviceName = this._tokenName.val() !== '' ? this._tokenName.val() : new Date();
 			var creatingToken = $.ajax(OC.generateUrl('/settings/personal/authtokens'), {
 				method: 'POST',
 				data: {