Made work with 4.6p1 and fixed bug where uses sent to main menu