Fixed matching end in user model