1 files changed, 7 insertions, 2 deletions

diff --git a/lib/Command/Room/Create.php b/lib/Command/Room/Create.php
index ade38c826..7ee58c646 100644
--- a/lib/Command/Room/Create.php
+++ b/lib/Command/Room/Create.php
@@ -121,14 +121,19 @@ class Create extends Base {
 
 		try {
 			$this->setRoomReadOnly($room, $readonly);
-			$this->setRoomPassword($room, $password);
+
+			if ($password !== null) {
+				$this->setRoomPassword($room, $password);
+			}
 
 			$this->addRoomParticipants($room, $users);
 			$this->addRoomParticipantsByGroup($room, $groups);
 			$this->addRoomParticipantsByCircle($room, $circles);
 			$this->addRoomModerators($room, $moderators);
 
-			$this->setRoomOwner($room, $owner);
+			if ($owner !== null) {
+				$this->setRoomOwner($room, $owner);
+			}
 		} catch (Exception $e) {
 			$room->deleteRoom();