User endpoints table

Fix #1234 
Fix #1212