Before login merge