refined Register and Login
fixed merge conflict within the Datasource.java