Windows 2012 Service - Not able to run newly upgraded 5.8.4 Confluence

I upgraded from 5.5.6 and can run Confluence off a command line so the upgrade works. But my service won't start.

My Java 8 is in Program Files
I did have JAVA_HOME as C:\Program Files... (with the space)
That was when I installed the service
Now I have it as JAVA_HOME as C:\Progra~1... (without the space)
But my service won't start
Do I have to reboot my machine for this to load?

I am getting this cryptic error in my event log:
The Atlassian Confluence service terminated with the following service-specific error: Incorrectfuction

In the event log is says this is a service type 1 error

Here are the details of this:

• <Event xmlns="http://schemas.microsoft.com/win/2004/08/events/event">
• <System>
  <Provider Name="Service Control Manager" Guid=" {555908d1-a6d7-4695-8e1e-26931d2012f4}

  " EventSourceName="Service Control Manager" />
  <EventID Qualifiers="49152">7024</EventID>
  <Version>0</Version>
  <Level>2</Level>
  <Task>0</Task>
  <Opcode>0</Opcode>
  <Keywords>0x8080000000000000</Keywords>
  <TimeCreated SystemTime="2015-06-29T23:19:28.346466300Z" />
  <EventRecordID>200389</EventRecordID>
  <Correlation />
  <Execution ProcessID="552" ThreadID="4496" />
  <Channel>System</Channel>
  <Computer>SF1-WGERS201.analytics.moodys.net</Computer>
  <Security />
  </System>

• <EventData>
  <Data Name="param1">Atlassian Confluence</Data>
  <Data Name="param2">%%1</Data>
  <Binary>43006F006E0066006C00750065006E00630065000000</Binary>
  </EventData>
  </Event>