Improve station registering a little bit

Change-Id: I49babd95bb8b11593ce585158aeee3fd20bf1fee