add app6 and app7, allow username to be specified in login