Redesigned to work also with users using other login services