diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index ebd2ac891d..fb30e83e25 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -33,10 +33,9 @@ <h1 class="mat-display-1 cover-title">{{ 'APP_NAME' | translate}}</h1>
   <div fxLayout="column" fxFlex.gt-md="1 0 30%" class="login-container">
 
     <!-- Language Selector to the extreme right -->
-    <div fxLayout="row-reverse" fxFlex="1 0 auto">
-      <mifosx-language-selector class="p-r-10 p-t-10"></mifosx-language-selector>
+    <div fxLayout="row-reverse" fxFlex="1 0 auto" fxLayoutAlign="center center">
+      <mifosx-language-selector class=" p-t-10"></mifosx-language-selector>
       <mifosx-theme-toggle class="p-r-10 p-t-10"></mifosx-theme-toggle>
-      <div fxFlex></div>
       <mifosx-server-selector class="p-l-10 p-t-10" *ngIf="environment.allowServerSwitch"></mifosx-server-selector>
     </div>
 
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index f1d37972e4..86663a9fd4 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -15,11 +15,54 @@ import { UntypedFormControl } from '@angular/forms';
 })
 export class SettingsComponent implements OnInit {
 
-  /** Placeholder for languages. update once translations are set up */
   languages: any[] = [
+    {
+      name: 'Čeština (Czech)',
+      code: 'cs'
+    },
+    {
+      name: 'Deutsch (German)',
+      code: 'de'
+    },
     {
       name: 'English',
       code: 'en'
+    },
+    {
+      name: 'Español (Spanish)',
+      code: 'es'
+    },
+    {
+      name: 'Français (French)',
+      code: 'fr'
+    },
+    {
+      name: 'Italiano (Italian)',
+      code: 'it'
+    },
+    {
+      name: '한국어 (Korean)',
+      code: 'ko'
+    },
+    {
+      name: 'Lietuvių (Lithuanian)',
+      code: 'lt'
+    },
+    {
+      name: 'Latviešu (Latvian)',
+      code: 'lv'
+    },
+    {
+      name: 'नेपाली (Nepali)',
+      code: 'ne'
+    },
+    {
+      name: 'Português (Portuguese)',
+      code: 'pt'
+    },
+    {
+      name: 'Kiswahili (Swahili)',
+      code: 'sw'
     }
   ];
   /** Date formats. */