MB-146 #Fixed logic for creating account