diff --git a/Application/Options/FeedWindow.xaml b/Application/Options/FeedWindow.xaml
index a9db278..bddfb9b 100644
--- a/Application/Options/FeedWindow.xaml
+++ b/Application/Options/FeedWindow.xaml
@@ -145,7 +145,7 @@
                            Margin="6"
                            Padding="20,0,0,0" />
                     <TextBox Name="AuthenticationUserNameTextBox"
-                             Text="{Binding Path=UserName, UpdateSourceTrigger=Explicit, ValidatesOnExceptions=True}"
+                             Text="{Binding Path=Username, UpdateSourceTrigger=Explicit, ValidatesOnExceptions=True}"
                              Grid.Column="1"
                              IsEnabled="{Binding ElementName=RequiresAuthenticationCheckBox, Path=IsChecked}"
                              Grid.Row="1"
@@ -158,12 +158,11 @@
                            Grid.Column="0"
                            Margin="6"
                            Padding="20,0,0,0" />
-                    <TextBox Name="AuthenticationPasswordTextBox"
-                             Text="{Binding Path=Password, UpdateSourceTrigger=Explicit, ValidatesOnExceptions=True}"
-                             Grid.Column="1"
-                             IsEnabled="{Binding ElementName=RequiresAuthenticationCheckBox, Path=IsChecked}"
-                             Grid.Row="2"
-                             Margin="6" />
+                    <PasswordBox Name="AuthenticationPasswordTextBox"
+                                 Grid.Column="1"
+                                 IsEnabled="{Binding ElementName=RequiresAuthenticationCheckBox, Path=IsChecked}"
+                                 Grid.Row="2"
+                                 Margin="6" />
                 </Grid>
             </TabItem>
         </TabControl>
diff --git a/Application/Options/FeedWindow.xaml.cs b/Application/Options/FeedWindow.xaml.cs
index d3edee3..962b7d2 100644
--- a/Application/Options/FeedWindow.xaml.cs
+++ b/Application/Options/FeedWindow.xaml.cs
@@ -37,6 +37,8 @@ namespace FeedCenter.Options
 
         private void HandleOkayButtonClick(object sender, RoutedEventArgs e)
         {
+            var feed = (Feed) DataContext;
+
             // Get a list of all framework elements and explicit binding expressions
             var bindingExpressions = this.GetBindingExpressions(new[] { UpdateSourceTrigger.Explicit });
 
@@ -76,6 +78,9 @@ namespace FeedCenter.Options
                 return;
             }
 
+            if (RequiresAuthenticationCheckBox.IsChecked.GetValueOrDefault(false))
+                feed.Password = AuthenticationPasswordTextBox.Password;
+
             // Dialog is good
             DialogResult = true;