diff --git a/smp-ui-tests/pom.xml b/smp-ui-tests/pom.xml
index f1fa03f3f35882b3572dd16f9d53e7c3b8eb6fb7..a4fb20c3e49ea18e52b967a527395bb508fd9bce 100644
--- a/smp-ui-tests/pom.xml
+++ b/smp-ui-tests/pom.xml
@@ -110,7 +110,7 @@
 							<failIfNoTests>true</failIfNoTests>
 
 							<systemPropertyVariables>
-								<webdriver.gecko.driver>${chrome.driver.path}</webdriver.gecko.driver>
+								<webdriver.chrome.driver>${chrome.driver.path}</webdriver.chrome.driver>
 								<reports.folder>./target/</reports.folder>
 								<data.folder>./src/main/resources/</data.folder>
 								<testdata.file>testData.json</testdata.file>
diff --git a/smp-ui-tests/src/main/java/utils/DriverManager.java b/smp-ui-tests/src/main/java/utils/DriverManager.java
index 6dc8ac2ab066618e7fc598448ad4a699b98eca66..a8c0672bde11d19effc8f7dfc49b1dcc85a2678d 100644
--- a/smp-ui-tests/src/main/java/utils/DriverManager.java
+++ b/smp-ui-tests/src/main/java/utils/DriverManager.java
@@ -1,6 +1,7 @@
 package utils;
 
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxDriverLogLevel;
 import org.openqa.selenium.firefox.FirefoxOptions;
@@ -25,13 +26,11 @@ public class DriverManager {
 //    }
 
     public static WebDriver getDriver(){
-		System.setProperty(FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE,"true");
-//		System.setProperty(FirefoxDriver.SystemProperty.BROWSER_LOGFILE,"C:\\temp\\logs.txt");
-		FirefoxOptions options = new FirefoxOptions();
-		FirefoxProfile profile= new FirefoxProfile();
-		profile.setPreference( "layout.css.devPixelsPerPx", "0.8" );
-		options.setProfile(profile);
-		WebDriver driver = new FirefoxDriver(options);
+		/*System.setProperty(FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE,"true");
+		System.setProperty(FirefoxDriver.SystemProperty.BROWSER_LOGFILE,"C:\\temp\\logs.txt");*/
+
+		System.setProperty("Webdriver.chrome.driver","D:\\Users\\monhaso\\Downloads\\Chromedriver");
+		WebDriver driver = new ChromeDriver();
 		driver.manage().timeouts().implicitlyWait(2, TimeUnit.SECONDS);
 		driver.manage().timeouts().pageLoadTimeout(5, TimeUnit.SECONDS);
 		driver.manage().timeouts().setScriptTimeout(2, TimeUnit.SECONDS);
diff --git a/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java b/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
index dfc836131bc4ce421fa9aa575f1a4c9779aa3fb3..b85f2fd8f7130887a1a5a9e0e865db27d1156919 100644
--- a/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
+++ b/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
@@ -70,7 +70,7 @@ public class SMPMessages {
 	public static final String MSG_23 = "Configuration error: Subject must have less than 256 character!";
 
 
-	public static final String USERNAME_VALIDATION_MESSAGE = "Username can only contain alphanumeric characters (letters A-Z, numbers 0-9) and must have from 4 to 32 characters!";
+	public static final String USERNAME_VALIDATION_MESSAGE = "Username is case insensitive and can only contain alphanumeric characters (letters a-zA-Z, numbers 0-9) and must have from 4 to 32 characters!";
 	public static final String PASS_POLICY_MESSAGE = "Minimum length: 16 characters;Maximum length: 32 characters;At least one letter in lowercase;At least one letter in uppercase;At least one digit;At least one special character";
 	public static final String PASS_NO_MATCH_MESSAGE = "Passwords do not match";
 	public static final String PASS_NO_EMPTY_MESSAGE = "You should type a password";