Changing database settings and user register initial details [244847 - 244852]
Solving some merge issues on previous commit