diff --git a/src/address/address.cpp b/src/address/address.cpp
index 9dd1e915f..504c7986f 100644
--- a/src/address/address.cpp
+++ b/src/address/address.cpp
@@ -61,7 +61,7 @@ Address::Address (const IdentityAddress &src) : ClonableObject(*new AddressPriva
 	);
 
 	if (src.hasGruu())
-		uri += "?gr=" + src.getGruu();
+		uri += ";gr=" + src.getGruu();
 
 	d->internalAddress = sal_address_new(L_STRING_TO_C(uri));
 }
diff --git a/src/address/identity-address.cpp b/src/address/identity-address.cpp
index 45c2d9383..982c55a69 100644
--- a/src/address/identity-address.cpp
+++ b/src/address/identity-address.cpp
@@ -38,9 +38,7 @@ IdentityAddress::IdentityAddress (const string &address) : ClonableObject(*new I
 		d->scheme = tmpAddress.getScheme();
 		d->username = tmpAddress.getUsername();
 		d->domain = tmpAddress.getDomain();
-		if (tmpAddress.hasUriParam("gr")) {
-			d->gruu = tmpAddress.getUriParamValue("gr");
-		}
+		d->gruu = tmpAddress.getUriParamValue("gr");
 	}
 }
 
@@ -57,9 +55,7 @@ IdentityAddress::IdentityAddress (const Address &src) : ClonableObject(*new Iden
 	d->scheme = src.getScheme();
 	d->username = src.getUsername();
 	d->domain = src.getDomain();
-	if (src.hasUriParam("gr")) {
-		d->gruu = src.getUriParamValue("gr");
-	}
+	d->gruu = src.getUriParamValue("gr");
 }
 
 IdentityAddress &IdentityAddress::operator= (const IdentityAddress &src) {