Fix for friends popup + support for 6th step