diff --git a/winixd/html/fun_account.html b/winixd/html/fun_account.html
index aaaa681..5230895 100644
--- a/winixd/html/fun_account.html
+++ b/winixd/html/fun_account.html
@@ -1,20 +1,47 @@
-
Account
+
{account_header}
[if user_logged]
-
You are logged as: [user_name]
- [if user_super_user]
- You are the root
- [end]
- [# !! IMPROVE ME add info about groups, may other parameters like time zone, language?]
-
+
+
+
+
+ {account_logged_as} |
+ [user_name] |
+
+
+ [if user_super_user]
+
+ {account_admin} |
+ {account_admin_yes} |
+
+ [end]
+
+ [if false]
+ [# improve me]
+
+ {account_groups} |
+ html, www, foo |
+
+ [end]
+
+
+ {account_timezone} |
+ [user_time_zone_name] |
+
+
+
+ {account_language} |
+ [user_locale_name] |
+
+
+
+
+
[else]
-
You are not logged in.
+
{account_not_logged}
[end]
-
-
-
diff --git a/winixd/locale/en b/winixd/locale/en
index 1a596a7..ae469a1 100644
--- a/winixd/locale/en
+++ b/winixd/locale/en
@@ -23,6 +23,16 @@ account_already_activated = This account is already activated
account_cannot_be_activated = This account cannot be activated, please contact with the system administrator
account_email_sent = An email with an activation link has been sent to you
+account_header = My Account
+account_logged_as = You are logged as:
+account_not_logged = You are not logged in.
+account_admin = Root
+account_admin_yes = yes
+account_groups = Groups
+account_timezone = Time zone
+account_language = Language
+
+
export_header = Export
export_transer_file_info = Press Export to transfer the file to an external ftp server
export_transer_dir_info = Press Export to transfer the directory to an external ftp server
diff --git a/winixd/locale/pl b/winixd/locale/pl
index a7fb39d..634a293 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -25,6 +25,15 @@ account_already_activated = To konto jest już aktywowane
account_cannot_be_activated = To konto nie może być aktywowane, proszę skontaktować się z administratorem
account_email_sent = Wysłaliśmy Tobie email z linkiem aktywacyjnym
+account_header = Moje konto
+account_logged_as = Jesteś zalogowany jako:
+account_not_logged = Nie jesteś zalogowany.
+account_admin = Administrator
+account_admin_yes = tak
+account_groups = Grupy
+account_timezone = Strefa czasowa
+account_language = Język
+
export_header = Export
export_transer_file_info = Wciśnij przycisk Export aby wysłać ten plik na zewnętrzny serwer ftp