diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index 0473b7f..d040f4b 100644
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -24,6 +24,7 @@ return [
     'download_action' => 'Download',
     'edit_action' => 'Edit',
     'email_label' => 'E-mail address:',
+    'enable_profile_page_label' => 'Allow others to see my profile page',
     'labels_label' => 'Labels:',
     'login_action' => 'Login',
     'name_label' => 'Name:',
@@ -33,6 +34,8 @@ return [
     'password_confirm_label' => 'Confirm password:',
     'please_select' => '- Select an Option -',
     'private_album_label' => 'Private album (only visible to me)',
+    'profile_alias_label' => 'Alias:',
+    'profile_alias_help' => 'The profile alias is used to create a unique URL direct to your profile page.',
     'quick_upload_file_label' => 'Photo:',
     'realname_label' => 'Your name:',
     'register_action' => 'Create account',
diff --git a/resources/lang/en/gallery.php b/resources/lang/en/gallery.php
index bd23787..b782b31 100644
--- a/resources/lang/en/gallery.php
+++ b/resources/lang/en/gallery.php
@@ -80,7 +80,6 @@ return [
     ],
     'user_settings' => [
         'change_password' => 'Change password',
-        'show_public_profile' => 'Allow others to see my profile page',
         'title' => 'Change my settings'
     ]
 ];
\ No newline at end of file
diff --git a/resources/views/themes/base/gallery/user_settings.blade.php b/resources/views/themes/base/gallery/user_settings.blade.php
index 983efc9..962ce1e 100644
--- a/resources/views/themes/base/gallery/user_settings.blade.php
+++ b/resources/views/themes/base/gallery/user_settings.blade.php
@@ -46,18 +46,41 @@
                                 </div>
                             </div>
 
-                            <div class="row">
+                            <div class="form-group row">
                                 <div class="col-md-6 offset-md-4">
                                     <a href="{{ route('auth.changePassword') }}" class="btn btn-link"><i class="fa fa-lock"></i>&nbsp;&nbsp;@lang('gallery.user_settings.change_password')</a>
                                 </div>
                             </div>
 
-                            <div class="form-check mt-4">
-                                <input type="checkbox" class="form-check-input" id="is-admin" name="is_admin"@if (old('is_admin', $user->is_admin)) checked="checked"@endif>
-                                <label class="form-check-label" for="is-admin">@lang('forms.admin_user_label')</label>
-                            </div>
+                            <fieldset class="mt-4">
+                                <legend class="ml-md-5">Public profile</legend>
 
-                            <div class="text-right" style="margin-top: 20px;">
+                                <div class="form-group row{{ $errors->has('profile_alias') ? ' has-danger' : '' }}">
+                                    <label class="col-md-4 col-form-label text-md-right" for="profile-alias">@lang('forms.profile_alias_label')</label>
+
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control{{ $errors->has('profile_alias') ? ' is-invalid' : '' }}" id="profile-alias" name="profile_alias" value="{{ old('profile_alias', $user->profile_alias) }}">
+                                        <small id="emailHelp" class="form-text text-muted">@lang('forms.profile_alias_help')</small>
+
+                                        @if ($errors->has('profile_alias'))
+                                            <div class="invalid-feedback">
+                                                <strong>{{ $errors->first('profile_alias') }}</strong>
+                                            </div>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <div class="form-group row">
+                                    <div class="col-md-6 offset-md-4">
+                                        <div class="form-check">
+                                            <input type="checkbox" class="form-check-input" id="enable-profile-page" name="enable_profile_page"@if (old('enable_profile_page', $user->enable_profile_page)) checked="checked"@endif>
+                                            <label class="form-check-label" for="enable-profile-page">@lang('forms.enable_profile_page_label')</label>
+                                        </div>
+                                    </div>
+                                </div>
+                            </fieldset>
+
+                            <div class="text-right mt-5">
                                 <a href="{{ route('home') }}" class="btn btn-link">@lang('forms.cancel_action')</a>
                                 <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
                             </div>