diff --git a/Makefile.ps3 b/Makefile.ps3
index 88f9dfe787..77e596a6ba 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -63,7 +63,7 @@ endif
 
 PPU_SRCS		= griffin/griffin.c
 
-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3
 
 ifeq ($(DEX_BUILD), 1)
 DEFINES += -DDEX_BUILD
diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index c4da205828..95a6887edd 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -3253,24 +3253,19 @@ found:
          char urle_user[64];
          char urle_login[64];
          const char *username = coro ? coro->settings->arrays.cheevos_username : NULL;
-         const char *login;
-         bool via_token;
+         const char *login    = NULL;
+         bool via_token       = false;
 
          if (coro)
          {
             if (string_is_empty(coro->settings->arrays.cheevos_password))
             {
-               via_token = true;
-               login = coro->settings->arrays.cheevos_token;
+               via_token      = true;
+               login          = coro->settings->arrays.cheevos_token;
             }
             else
-            {
-               via_token = false;
-               login = coro->settings->arrays.cheevos_password;
-            }
+               login          = coro->settings->arrays.cheevos_password;
          }
-         else
-            login = NULL;
         
          if (string_is_empty(username) || string_is_empty(login))
          {