added old user support