diff --git a/mkdocs/docs/issuer/demo-issuer.md b/mkdocs/docs/issuer/demo-issuer.md
deleted file mode 100644
index 685dbf04..00000000
--- a/mkdocs/docs/issuer/demo-issuer.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# Demo Issuer
-
-The [Demo Issuer](https://issuer-demo.polygonid.me/) is a playground that allows you to create credentials without having to set up an Issuer Node and fetch it inside your wallet.
-
-## Prerequisites
-
-Download the Polygon ID Wallet App and create an Identity.
-
-- For Android: Polygon ID on Google Play
-- For iOS: Polygon ID on the App Store
-
-## Quick Start
-
-To create a credential, you require a schema that contains semantics of the JSON vocabulary and is used to describe a large number of data sets. The schema contains links to JSON-LD Context and JSON URL. For this tutorial, we will be using a customized Schema named `ProofOfDaoLongevity` that attests to someone's `entryDate` inside a DAO. You can find more info about that schema and how to [create a custom Schema](./schema.md).
-
-To create a credential, the Polygon ID app must be installed on your mobile.
-
-1. On the [Issuer website](https://issuer-demo.polygonid.me/), click **Sign up**.
-
-
-

-
-
-
- It shows the QR code on screen:
-
-
-

-
-
-
-2. Open the Polygon ID app and authenticate with pin/biometrics
-
-
-

-
-
-
-3. On the app, click **Connect**.
-
-
-

-
-
-
-4. With the app, scan the QR code displayed on the site and click **Connect Wallet**.
-
-
-

-
-
-
-5. Authenticate again with your pin/biometrics. This starts the authentication of the user's wallet.
-
-
-

-
-
-
- After the authentication process is complete, the app shows the message if the identity is successfully authenticated or if it failed to authenticate.
-
-
-

-
-
-
- At this point, the Issuer has received information about your Identifier (DID) and can use it as the subject of the credential that will be issued in the next step.
-
-6. On the website, click **Create Claim**.
-
-
-

-
-
-
- This shows the **Create Claim** window:
-
-
-

-
-
-
-7. Click the ***Schema*** dropdown menu and select the type of schema you want to use for creating credentials.
-
- Two schemas types are already available in the drop-down menu: KYCAgeCredential and KYCCountryOfResidenceCredential.
- If you want to use a custom schema, select ***custom*** from the drop-down menu.
- For this example, we are using the `ProofOfDaoLongevity` schema created in the [Create Custom Schemas](./schema.md) tutorial.
- The menu needs to be populated with the JSON Schema URL and the Type of the schema. Which in this case are:
-
- - `https://raw.githubusercontent.com/0xPolygonID/tutorial-examples/main/credential-schema/proof-of-dao-longevity.json`
- - `ProofOfDaoLongevity`
-
- The ***expiration*** date sets the date on which the credential will expire.
- The ***Data JSON*** contains the actual data that the credential is attesting to. In this case, the credential contains a single field `entryDate` that needs to be populated with the date the user joined the DAO.
-
- Once filled up, click **Submit**.
-
-
-

-
-
-
- This creates a new credential. Scan the QR code from the wallet app to fetch the credential in the wallet.
-
-
-

-
-
-
-8. Once a credential is created, you can view it on the Issuer site. For this, click the icon to open and view the credential.
-
-
-

-
-
-
-This shows all the information related to a credential; this includes:
-
-- @Context (JSON-LD Schema) and CredentialSchema (JSON) URLs
-- credentialStatus: URL to fetch the [Revocation](https://docs.iden3.io/getting-started/claim-revocation/) status of the credential from the Issuer along with the revocation nonce.
-- credentialSubject: Information related to the Subject of the Credential. In this example, this includes subject's `entryDate` and id of the Subject in the `did` format.
-- Other information such as expiration date of the credential, issuance date, and ID of the Issuer in the `did` format.
-- Proof which includes information such as state of the issuer identity published on-chain, the non-revocation proof for the [authorization claim](https://docs.iden3.io/getting-started/claim/auth-claim/), and the actual credential [signed](https://docs.iden3.io/getting-started/signature-claim/signature/) by the Issuer.
\ No newline at end of file
diff --git a/mkdocs/docs/verifier/on-chain-verification/overview.md b/mkdocs/docs/verifier/on-chain-verification/overview.md
index a1960223..a9217491 100644
--- a/mkdocs/docs/verifier/on-chain-verification/overview.md
+++ b/mkdocs/docs/verifier/on-chain-verification/overview.md
@@ -41,7 +41,15 @@ In this tutorial, we will create an ERC20 zk Airdrop Contract. The chosen query
This tutorial is based on the verification of a Credential of Type `KYCAgeCredential` with an attribute `birthday` with a Schema URL `https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld`.
-The prerequisite is that users have the [Polygon ID Wallet app](../../wallet/wallet-overview.md) installed and self-issued a Credential of type `KYC Age Credential Merklized` using our [Demo Issuer](https://issuer-demo.polygonid.me/)
+The prerequisite is that users have the [Polygon ID Wallet app](../../wallet/wallet-overview.md) installed and self-issued a Credential of type `KYC Age Credential Merklized` using our [Demo Issuer](https://issuer-ui.polygonid.me/).
+
+!!!warning "Demo Issuer username and password"
+ The [Demo Issuer](https://issuer-ui.polygonid.me/) requires a username and a password to log into the system.
+
+ - Username: `user-ui`
+ - Password: `password-ui`
+
+ We are aware that we might not be using the best approach from a security standpoint, but we are working on a better alternative to be released soon.
---
**Note:** The full executable code related to this tutorial can be cloned from this repository.
diff --git a/mkdocs/docs/verifier/verification-library/verifier-set-up.md b/mkdocs/docs/verifier/verification-library/verifier-set-up.md
index 6645a016..df77369e 100644
--- a/mkdocs/docs/verifier/verification-library/verifier-set-up.md
+++ b/mkdocs/docs/verifier/verification-library/verifier-set-up.md
@@ -13,7 +13,15 @@ The Verifier Client is the point of interaction with the user. In its simplest f
This tutorial is based on the verification of a Credential of Type `KYCAgeCredential` with an attribute `birthday` with a Schema URL `https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld`.
-The prerequisite is that users have the [Polygon ID Wallet app](../../wallet/wallet-overview.md) installed and self-issued a Credential of type `KYC Age Credential Merklized` using our [Demo Issuer](https://issuer-demo.polygonid.me/). Further credentials can be issued using the [Issuer Node](../../issuer/issuer-overview.md).
+The prerequisite is that users have the [Polygon ID Wallet app](../../wallet/wallet-overview.md) installed and self-issued a Credential of type `KYC Age Credential Merklized` using our [Demo Issuer](https://issuer-ui.polygonid.me/). Further credentials can be issued using the [Issuer Node](../../issuer/issuer-overview.md).
+
+!!!warning "Demo Issuer username and password"
+ The [Demo Issuer](https://issuer-ui.polygonid.me/) requires a username and a password to log into the system.
+
+ - Username: `user-ui`
+ - Password: `password-ui`
+
+ We are aware that we might not be using the best approach from a security standpoint, but we are working on a better alternative to be released soon.
In this example, the verifier will set up the query: "Prove that you were born before the `2000/01/01`. To set up a different query check out the [ZK Query Language section](./zk-query-language.md)
diff --git a/mkdocs/docs/verifier/verifier-overview.md b/mkdocs/docs/verifier/verifier-overview.md
index b776b6c8..c1292025 100644
--- a/mkdocs/docs/verifier/verifier-overview.md
+++ b/mkdocs/docs/verifier/verifier-overview.md
@@ -29,7 +29,14 @@ You can quickly try out the Verification experience by following the steps below
- Download the Polygon ID Wallet App and create an Identity.
> - For Android: Polygon ID on Google Play
> - For iOS: Polygon ID on the App Store
-- Fetch a credential from the [Demo Issuer](https://issuer-demo.polygonid.me/)
+- Fetch a credential from the [Demo Issuer](https://issuer-ui.polygonid.me/)
- Verify it on the [Demo Verifier](https://verifier-demo.polygonid.me/)
+!!!warning "Demo Issuer username and password"
+ The [Demo Issuer](https://issuer-ui.polygonid.me/) requires a username and a password to log into the system.
+
+ - Username: `user-ui`
+ - Password: `password-ui`
+
+ We are aware that we might not be using the best approach from a security standpoint, but we are working on a better alternative to be released soon.