fix signin & signup bug
merge with GFS