diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index 3f1e6fd951acc8b02e3f8c4d1c97674c758a2953..b39ae3e8c0cd2219c6d00203571ea28bc41751b0 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -578,7 +578,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 		}
 
 		if(empty($this->requestId)) {
-			$this->requestId = $this->secureRandom->generate(20);
+			$validChars = ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS;
+			$this->requestId = $this->secureRandom->generate(20, $validChars);
 		}
 
 		return $this->requestId;
diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
index 8011f63ab136b120bd158fb722df0fc703180dad..97ec5012b1f34172dc852228358ea4c55b4c4615 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -106,14 +106,14 @@ class File {
 		$version = $config->getValue('version', '');
 		$entry = compact(
 			'reqId',
-			'remoteAddr',
-			'app',
-			'message',
 			'level',
 			'time',
+			'remoteAddr',
+			'user',
+			'app',
 			'method',
 			'url',
-			'user',
+			'message',
 			'userAgent',
 			'version'
 		);