diff --git a/lib/Controller/MessageApiController.php b/lib/Controller/MessageApiController.php
index 52882b81a4..b30d6ab965 100644
--- a/lib/Controller/MessageApiController.php
+++ b/lib/Controller/MessageApiController.php
@@ -455,8 +455,7 @@ public function getAttachment(int $id, string $attachmentId): DataResponse {
 	 */
 	private function handleAttachments(): array {
 		$fileAttachments = $this->request->getUploadedFile('attachments');
-		$hasAttachments = isset($fileAttachments['name']);
-		if (!$hasAttachments) {
+		if (!isset($fileAttachments['name'])) {
 			return [];
 		}
 
diff --git a/lib/Db/Provisioning.php b/lib/Db/Provisioning.php
index 8d85c6d153..31e0a22081 100644
--- a/lib/Db/Provisioning.php
+++ b/lib/Db/Provisioning.php
@@ -145,9 +145,7 @@ public function buildEmail(IUser $user) {
 	 * @return string
 	 */
 	private function buildUserEmail(string $original, IUser $user) {
-		if ($user->getUID() !== null) {
-			$original = str_replace('%USERID%', $user->getUID(), $original);
-		}
+		$original = str_replace('%USERID%', $user->getUID(), $original);
 		if ($user->getEMailAddress() !== null) {
 			$original = str_replace('%EMAIL%', $user->getEMailAddress(), $original);
 		}