diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 7f7d6273e306b..78d4a51cf1681 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -556,6 +556,9 @@ public function getAvatarImage($size) {
 	public function getCloudId() {
 		$uid = $this->getUID();
 		$server = $this->urlGenerator->getAbsoluteURL('/');
+		if (substr($server, -10) === '/index.php') {
+			$server = substr($server, 0, -10);
+		}
 		$server = rtrim($this->removeProtocolFromUrl($server), '/');
 		return $uid . '@' . $server;
 	}