Asterisk 13 Device and User mode setup with Cisco SPA504G Name-Extension

I have FreePBX 13.0.182 in Device and User mode and am trying to setup Cisco spa504G phones to be able to login and show the user/extension on the lines. I have EPM (13.0.84.3) but don’t need to use it if there is a better way. Currently I have the phones allowing login but the lines still show the device number instead of the user and extension.

It will always show the device number as that is what is registered to the PBX. Limitation of Device and User mode.