Fix migrate for new user - fix #1380